apply order_type to rpc req body

Author: smk762

atomic_defi_design/Dex/Exchange/ProView/TradingInfo/MarketModeSelector.qml atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/MarketModeSelector.qml

@@ -9,6 +9,7 @@ import App 1.0
 import Dex.Themes 1.0 as Dex
 import Dex.Components 1.0 as Dex
 import AtomicDEX.TradingError 1.0
+import AtomicDEX.MarketMode 1.0 as Dex
 
 ColumnLayout
 {
@@ -61,6 +62,36 @@ ColumnLayout
         function onBackend_volumeChanged() { input_volume.text = exchange_trade.backend_volume; }
     }
 
+    // Market mode selector
+    RowLayout
+    {
+        Layout.topMargin: 2
+        Layout.bottomMargin: 2
+        Layout.alignment: Qt.AlignHCenter
+        Layout.preferredWidth: parent.width
+        height: 28
+
+        MarketModeSelector
+        {
+            Layout.alignment: Qt.AlignLeft
+            Layout.preferredWidth: 125
+            Layout.preferredHeight: 28
+            marketMode: Dex.MarketMode.Buy
+            ticker: atomic_qt_utilities.retrieve_main_ticker(left_ticker)
+        }
+
+        Item { Layout.fillWidth: true }
+
+        MarketModeSelector
+        {
+            marketMode: Dex.MarketMode.Sell
+            Layout.alignment: Qt.AlignRight
+            Layout.preferredWidth: 125
+            Layout.preferredHeight: 28
+            ticker: atomic_qt_utilities.retrieve_main_ticker(left_ticker)
+        }
+    }
+
     Item
     {
         Layout.preferredWidth: parent.width

atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderForm.qml

@@ -86,40 +86,6 @@ ColumnLayout
                     Layout.rightMargin: 8
                 }
 
-                // Market mode selector
-                RowLayout
-                {
-                    Layout.topMargin: 2
-                    Layout.bottomMargin: 2
-                    Layout.alignment: Qt.AlignHCenter
-                    Layout.preferredWidth: 435
-                    height: 28
-
-                    Item { Layout.fillWidth: true }
-                    MarketModeSelector
-                    {
-                        Layout.alignment: Qt.AlignLeft
-                        Layout.preferredWidth: 150
-                        Layout.preferredHeight: 28
-                        marketMode: MarketMode.Buy
-                        ticker: atomic_qt_utilities.retrieve_main_ticker(left_ticker)
-                    }
-
-                    Item { Layout.fillWidth: true }
-              
-                    Item { Layout.fillWidth: true }
-
-                    MarketModeSelector
-                    {
-                        Layout.alignment: Qt.AlignRight
-                        Layout.preferredWidth: 150
-                        Layout.preferredHeight: 28
-                        ticker: atomic_qt_utilities.retrieve_main_ticker(left_ticker)
-                    }
-                    Item { Layout.fillWidth: true }
-                }
-
-
                 // Chart
                 Chart
                 {

atomic_defi_design/Dex/Exchange/ProView/TradingInfo/Main.qml

@@ -264,7 +264,7 @@ MultipageModal
                         boxHeight: 20
                         checked: true
                         height: 40
-                        text: qsTr("Good until canceled (order will remain on orderbook until filled or canceled)")
+                        text: qsTr("Good until cancelled (order will remain on orderbook until filled or cancelled)")
                     }
 
                     DefaultCheckBox
@@ -450,7 +450,8 @@ MultipageModal
                     trade({ enable_custom_config: enable_custom_config.checked,
                             is_dpow_configurable: config_section.is_dpow_configurable,
                             enable_dpow_confs: enable_dpow_confs.checked,
-                            required_confirmation_count: required_confirmation_count.value, },
+                            required_confirmation_count: required_confirmation_count.value,
+                            good_until_canceled: _goodUntilCanceledCheckbox.checked},
                             config_section.default_config)
                     API.app.trading_pg.reset_fees()
                 }

atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml

@@ -17,7 +17,7 @@ MultipageModal
             Layout.fillWidth: true
 
             wrapMode: Text.WordWrap
-            text: qsTr("The selected order does not exist anymore, it might have been matched or canceled, and no order with a better price is available.\nPlease select a new order.")
+            text: qsTr("The selected order does not exist anymore, it might have been matched or cancelled, and no order with a better price is available.\nPlease select a new order.")
         }
 
         footer:

atomic_defi_design/Dex/Exchange/Trade/SimpleView/OrderRemovedModal.qml

@@ -144,9 +144,9 @@ Item
         }
 
         if (sell_mode)
-            API.app.trading_pg.place_sell_order(nota, confs)
+            API.app.trading_pg.place_sell_order(nota, confs, options.good_until_canceled)
         else
-            API.app.trading_pg.place_buy_order(nota, confs)
+            API.app.trading_pg.place_buy_order(nota, confs, options.good_until_canceled)
 
         orderPlaced()
     }

atomic_defi_design/Dex/Exchange/Trade/Trade.qml

@@ -15,7 +15,6 @@
  ******************************************************************************/
 
 //! Deps
-#include <nlohmann/json.hpp>
 #include <spdlog/spdlog.h>
 
 //! Project Headers
@@ -75,5 +74,9 @@ namespace atomic_dex::mm2
         {
             SPDLOG_INFO("The order is not picked from orderbook we create it from volume = {}, price = {}", j.at("volume").dump(4), request.price);
         }
+        if (request.order_type.has_value())
+        {
+            j["order_type"] = request.order_type.value();
+        }
     }
 } // namespace atomic_dex::mm2

src/core/atomicdex/api/mm2/rpc_v1/rpc.buy.cpp

@@ -21,7 +21,7 @@
 #include <string>
 
 //! Deps
-#include <nlohmann/json_fwd.hpp>
+#include <nlohmann/json.hpp>
 
 //! Project Header
 #include <atomicdex/api/mm2/trading.order.contents.hpp>
@@ -43,7 +43,9 @@ namespace atomic_dex::mm2
         bool                       selected_order_use_input_volume{false};
         std::optional<bool>        base_nota{std::nullopt};
         std::optional<std::size_t> base_confs{std::nullopt};
+        // bool                       is_max;
         std::optional<std::string> min_volume{std::nullopt};
+        std::optional<nlohmann::json> order_type;
     };
 
     void to_json(nlohmann::json& j, const buy_request& request);

src/core/atomicdex/api/mm2/rpc_v1/rpc.buy.hpp

@@ -15,7 +15,6 @@
  ******************************************************************************/
 
 //! Deps
-#include <nlohmann/json.hpp>
 #include <spdlog/spdlog.h>
 
 //! Project Headers

src/core/atomicdex/api/mm2/rpc_v1/rpc.sell.cpp

@@ -138,7 +138,7 @@ namespace atomic_dex
     }
 
     void
-    trading_page::place_buy_order(const QString& base_nota, const QString& base_confs)
+    trading_page::place_buy_order(const QString& base_nota, const QString& base_confs, const QString& good_until_canceled)
     {
         this->set_buy_sell_rpc_busy(true);
         this->set_buy_sell_last_rpc_data(QJsonObject{{}});
@@ -178,6 +178,19 @@ namespace atomic_dex
             .base_confs                     = base_confs.isEmpty() ? std::optional<std::size_t>{std::nullopt} : base_confs.toUInt(),
             .min_volume = (rel_min_volume_f <= rel_min_trade) ? std::optional<std::string>{std::nullopt} : get_min_trade_vol().toStdString()};
 
+        if (good_until_canceled == "true")
+        {
+            SPDLOG_DEBUG("Good until cancelled order");
+            req.order_type                 = nlohmann::json::object();
+            req.order_type.value()["type"] = "GoodTillCancelled";
+        }
+        else
+        {
+            SPDLOG_DEBUG("Fill or kill order");
+            req.order_type                 = nlohmann::json::object();
+            req.order_type.value()["type"] = "FillOrKill";
+        }
+
         if (is_selected_min_max || is_selected_order)
         {
             req.min_volume = std::optional<std::string>{std::nullopt};
@@ -269,7 +282,7 @@ namespace atomic_dex
     }
 
     void
-    trading_page::place_sell_order(const QString& rel_nota, const QString& rel_confs)
+    trading_page::place_sell_order(const QString& rel_nota, const QString& rel_confs, const QString& good_until_canceled)
     {
         this->set_buy_sell_rpc_busy(true);
         this->set_buy_sell_last_rpc_data(QJsonObject{{}});
@@ -312,6 +325,18 @@ namespace atomic_dex
             req.order_type.value()["type"] = "FillOrKill";
             req.min_volume                 = std::optional<std::string>{std::nullopt};
         }
+        else if (good_until_canceled == "true")
+        {
+            SPDLOG_DEBUG("Good until cancelled order");
+            req.order_type                 = nlohmann::json::object();
+            req.order_type.value()["type"] = "GoodTillCancelled";
+        }
+        else
+        {
+            SPDLOG_DEBUG("Fill or kill order");
+            req.order_type                 = nlohmann::json::object();
+            req.order_type.value()["type"] = "FillOrKill";
+        }
 
         if (is_selected_min_max)
         {

src/core/atomicdex/pages/qt.trading.page.cpp

@@ -161,8 +161,8 @@ namespace atomic_dex
         Q_INVOKABLE bool set_pair(bool is_left_side, const QString& changed_ticker);
         Q_INVOKABLE void set_current_orderbook(const QString& base, const QString& rel); ///< market_selector (called and selecting another coin)
 
-        Q_INVOKABLE void place_buy_order(const QString& base_nota = "", const QString& base_confs = "");
-        Q_INVOKABLE void place_sell_order(const QString& rel_nota = "", const QString& rel_confs = "");
+        Q_INVOKABLE void place_buy_order(const QString& base_nota = "", const QString& base_confs = "", const QString& good_until_canceled = "");
+        Q_INVOKABLE void place_sell_order(const QString& rel_nota = "", const QString& rel_confs = "", const QString& good_until_canceled = "");
 
         Q_INVOKABLE void reset_order();