From df186bcd1d724714a0efb8b9cc82296dca696e5f Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Jun 2024 13:14:58 +0800 Subject: [PATCH 01/14] extend to 8dp --- atomic_defi_design/Dex/Constants/General.qml | 2 +- src/core/atomicdex/services/price/global.provider.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml index 6defe9de94..d9625cdb59 100644 --- a/atomic_defi_design/Dex/Constants/General.qml +++ b/atomic_defi_design/Dex/Constants/General.qml @@ -571,7 +571,7 @@ QtObject { } return diffPrefix(received) + (fiat === API.app.settings_pg.current_fiat ? API.app.settings_pg.current_fiat_sign : API.app.settings_pg.current_currency_sign) - + " " + (amount < 1E5 ? formatDouble(parseFloat(amount), precision, true) : nFormatter(parseFloat(amount), 2)) + + " " + (amount < 1E5 ? formatDouble(parseFloat(amount), precision, true) : nFormatter(parseFloat(amount), precision)) } function formatPercent(value, show_prefix=true) { diff --git a/src/core/atomicdex/services/price/global.provider.cpp b/src/core/atomicdex/services/price/global.provider.cpp index d9d84a0852..64c02f1186 100644 --- a/src/core/atomicdex/services/price/global.provider.cpp +++ b/src/core/atomicdex/services/price/global.provider.cpp @@ -182,7 +182,7 @@ namespace atomic_dex { if (current_price_f < 1.0) { - default_precision = 5; + default_precision = 8; } } //! Trick: If there conversion in a fixed representation is 0.00 then use a default precision to 2 without fixed ios flags From 7dc8c3bb374ce98ff692f51ff8f6ac0febde98ad Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Jun 2024 17:08:05 +0800 Subject: [PATCH 02/14] rm leaky log --- src/core/atomicdex/pages/qt.wallet.page.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/atomicdex/pages/qt.wallet.page.cpp b/src/core/atomicdex/pages/qt.wallet.page.cpp index 14b383dae8..74056aa5e2 100644 --- a/src/core/atomicdex/pages/qt.wallet.page.cpp +++ b/src/core/atomicdex/pages/qt.wallet.page.cpp @@ -735,7 +735,7 @@ namespace atomic_dex nlohmann::json json_data = mm2::template_request("withdraw", true); mm2::to_json(json_data, withdraw_req); - SPDLOG_DEBUG("final json: {}", json_data.dump(4)); + batch.push_back(json_data); std::string amount_std = amount.toStdString(); From dd552de662225b2471f088a37aa3938b52141369 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Jun 2024 18:34:08 +0800 Subject: [PATCH 03/14] fix missing rates calc --- .../atomicdex/models/qt.portfolio.model.cpp | 2 ++ .../services/price/global.provider.cpp | 23 +++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/core/atomicdex/models/qt.portfolio.model.cpp b/src/core/atomicdex/models/qt.portfolio.model.cpp index 55b6557f2f..6c0b8bc922 100644 --- a/src/core/atomicdex/models/qt.portfolio.model.cpp +++ b/src/core/atomicdex/models/qt.portfolio.model.cpp @@ -109,6 +109,8 @@ namespace atomic_dex bool portfolio_model::update_activation_status() { + // This feels a bit heavy handed. There should be a better way to do this. + // Function may be unused. const auto& mm2_system = this->m_system_manager.get_system(); const auto coins = this->m_system_manager.get_system().get_global_cfg()->get_enabled_coins(); diff --git a/src/core/atomicdex/services/price/global.provider.cpp b/src/core/atomicdex/services/price/global.provider.cpp index d9d84a0852..74aefc3d1a 100644 --- a/src/core/atomicdex/services/price/global.provider.cpp +++ b/src/core/atomicdex/services/price/global.provider.cpp @@ -99,15 +99,18 @@ namespace atomic_dex global_price_service::refresh_other_coins_rates( const std::string& quote_id, const std::string& ticker, bool with_update_providers, std::atomic_uint16_t nb_try) { - // nb_try += 1; - // TODO: Paprika price conversion removed, needs to be replaced - nb_try = 10; - SPDLOG_INFO("refresh_other_coins_rates - try {}", nb_try.load()); - if (nb_try == 10) + t_float_50 price = safe_float(get_rate_conversion("USD", ticker, true)); + if (price <= 0) { - SPDLOG_WARN("refresh other coins rates max try reached, skipping"); - return; + SPDLOG_ERROR("Price is 0 for ticker: {}", ticker); + this->m_coin_rate_providers[ticker] = "0.00"; } + else + { + t_float_50 rate = 1 / price; + this->m_coin_rate_providers[ticker] = rate.str(); + } + } global_price_service::global_price_service(entt::registry& registry, ag::ecs::system_manager& system_manager, atomic_dex::cfg& cfg) : @@ -140,14 +143,14 @@ namespace atomic_dex { if (fiat == utils::retrieve_main_ticker(ticker_in)) { - return "1"; + return "1.00"; } std::string ticker = utils::retrieve_main_ticker(ticker_in); try { //! FIXME: fix zatJum crash report, frontend QML try to retrieve price before program is even launched if (ticker.empty()) - return "0"; + return "0.00"; auto& provider = m_system_manager.get_system(); std::string current_price = provider.get_rate_conversion(ticker); @@ -182,7 +185,7 @@ namespace atomic_dex { if (current_price_f < 1.0) { - default_precision = 5; + default_precision = 8; } } //! Trick: If there conversion in a fixed representation is 0.00 then use a default precision to 2 without fixed ios flags From 8f4f13a735339829f31a4a478e594a35608ba85b Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Jun 2024 20:18:14 +0800 Subject: [PATCH 04/14] more triggers to scroll asks to bottom in pro orderbook --- .../Dex/Exchange/Trade/OrderBook/List.qml | 36 ++++++++++++++++--- .../Dex/Exchange/Trade/OrderBook/Vertical.qml | 1 - 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml index 16b15f0d9d..e67d03e6e0 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml @@ -12,7 +12,6 @@ Item id: _control property bool isAsk - property bool isVertical: false width: parent.width height: parent.height @@ -29,7 +28,11 @@ Item onContentHeightChanged: { - if (isVertical) _tm.start(); + if (isAsk){ + // Duplication is intended. Sometimes data takes too long to load so slowscroll is a backup. + slowscroll_timer.start(); + quickscroll_timer.start() + } } delegate: Item @@ -47,12 +50,37 @@ Item Timer { - id: _tm - interval: 2000 + id: slowscroll_timer + interval: 1500 onTriggered: { orderbook_list.positionViewAtEnd() } } + Timer + { + id: quickscroll_timer + interval: 500 + onTriggered: + { + orderbook_list.positionViewAtEnd() + } + } + onModelChanged: { + if (isAsk) quickscroll_timer.start() + } + } + + Connections { + target: API.app.trading_pg + onMarketModeChanged: { + if (isAsk) quickscroll_timer.start() + } + onOrderbookChanged: { + if (isAsk) quickscroll_timer.start() + } + onMarketPairsChanged: { + if (isAsk) quickscroll_timer.start() + } } } \ No newline at end of file diff --git a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/Vertical.qml b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/Vertical.qml index 74d07bcafc..a32347e739 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/Vertical.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/Vertical.qml @@ -29,7 +29,6 @@ Widget List { isAsk: true - isVertical: true Layout.fillHeight: true Layout.fillWidth: true } From 07f0396a8c9001a995f8149bcff7861b8274447b Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Jun 2024 22:14:36 +0800 Subject: [PATCH 05/14] add settings toggle for orders display after placement --- .../Dex/Exchange/Trade/ProView.qml | 6 ++++- .../Dex/Exchange/Trade/SimpleView/Main.qml | 5 +++- .../Dex/Settings/SettingModal.qml | 26 +++++++++++++++++++ src/core/atomicdex/config/app.cfg.cpp | 20 ++++++++++++++ src/core/atomicdex/config/app.cfg.hpp | 2 ++ src/core/atomicdex/pages/qt.settings.page.cpp | 14 ++++++++++ src/core/atomicdex/pages/qt.settings.page.hpp | 4 +++ 7 files changed, 75 insertions(+), 2 deletions(-) diff --git a/atomic_defi_design/Dex/Exchange/Trade/ProView.qml b/atomic_defi_design/Dex/Exchange/Trade/ProView.qml index 6ebe7a1f6b..88e66b9641 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/ProView.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/ProView.qml @@ -102,7 +102,11 @@ RowLayout General.prettifyJSON(response.result), false) General.prevent_coin_disabling.restart() - tradingInfo.currentIndex = 1 + // Show the orders tab unless settings say otherwise + if (API.app.settings_pg.postorder_enabled) + { + tradingInfo.currentIndex = 1 + } } } } diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/Main.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/Main.qml index 6d52f44351..feb3ebd7ff 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/Main.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/Main.qml @@ -29,7 +29,10 @@ Item target: exchange_trade function onOrderPlaced() { - currentSubPage = subPages.Orders + if (API.app.settings_pg.postorder_enabled) + { + currentSubPage = subPages.Orders + } } } diff --git a/atomic_defi_design/Dex/Settings/SettingModal.qml b/atomic_defi_design/Dex/Settings/SettingModal.qml index 332e245c6b..246d38c9b3 100644 --- a/atomic_defi_design/Dex/Settings/SettingModal.qml +++ b/atomic_defi_design/Dex/Settings/SettingModal.qml @@ -482,6 +482,32 @@ Qaterial.Dialog } } } + + // Post-order placement toggle + RowLayout + { + width: parent.width - 30 + anchors.horizontalCenter: parent.horizontalCenter + height: 50 + + DexLabel + { + Layout.alignment: Qt.AlignVCenter + Layout.fillWidth: true + font: DexTypo.subtitle1 + text: qsTr("Show orders after placement") + } + + Item { Layout.fillWidth: true } + + DexSwitch + { + Layout.alignment: Qt.AlignVCenter + Component.onCompleted: checked = API.app.settings_pg.postorder_enabled + onCheckedChanged: API.app.settings_pg.postorder_enabled = checked + } + } + } } Item diff --git a/src/core/atomicdex/config/app.cfg.cpp b/src/core/atomicdex/config/app.cfg.cpp index 770b7be2e4..50f16d1cc2 100644 --- a/src/core/atomicdex/config/app.cfg.cpp +++ b/src/core/atomicdex/config/app.cfg.cpp @@ -50,6 +50,7 @@ namespace config_json_data["available_signs"] = config.available_currency_signs; config_json_data["notification_enabled"] = config.notification_enabled; config_json_data["spamfilter_enabled"] = config.spamfilter_enabled; + config_json_data["postorder_enabled"] = config.postorder_enabled; config_json_data["static_rpcpass_enabled"] = config.static_rpcpass_enabled; file.close(); @@ -85,6 +86,15 @@ namespace atomic_dex config.spamfilter_enabled = true; } + if (j.contains("postorder_enabled")) + { + j.at("postorder_enabled").get_to(config.postorder_enabled); + } + else + { + config.postorder_enabled = true; + } + if (j.contains("static_rpcpass_enabled")) { j.at("static_rpcpass_enabled").get_to(config.static_rpcpass_enabled); @@ -105,6 +115,16 @@ namespace atomic_dex } } + void + change_postorder_status(cfg& config, bool is_enabled) + { + if (config.postorder_enabled != is_enabled) + { + config.postorder_enabled = is_enabled; + upgrade_cfg(config); + } + } + void change_spamfilter_status(cfg& config, bool is_enabled) { diff --git a/src/core/atomicdex/config/app.cfg.hpp b/src/core/atomicdex/config/app.cfg.hpp index 550a182386..d707ee02d5 100644 --- a/src/core/atomicdex/config/app.cfg.hpp +++ b/src/core/atomicdex/config/app.cfg.hpp @@ -32,6 +32,7 @@ namespace atomic_dex std::vector recommended_fiat; std::vector possible_currencies; bool notification_enabled; + bool postorder_enabled{false}; bool spamfilter_enabled{false}; bool static_rpcpass_enabled{false}; }; @@ -40,6 +41,7 @@ namespace atomic_dex void change_currency(cfg& config, const std::string& new_currency); void change_fiat(cfg& config, const std::string& new_fiat); void change_notification_status(cfg& config, bool is_enabled); + void change_postorder_status(cfg& config, bool is_enabled); void change_spamfilter_status(cfg& config, bool is_enabled); void change_static_rpcpass_status(cfg& config, bool is_enabled); [[nodiscard]] bool is_this_currency_a_fiat(const cfg& config, const std::string& currency); diff --git a/src/core/atomicdex/pages/qt.settings.page.cpp b/src/core/atomicdex/pages/qt.settings.page.cpp index 35ac7792d5..e8a74389bb 100644 --- a/src/core/atomicdex/pages/qt.settings.page.cpp +++ b/src/core/atomicdex/pages/qt.settings.page.cpp @@ -226,6 +226,20 @@ namespace atomic_dex } } + bool atomic_dex::settings_page::is_postorder_enabled() const + { + return m_config.postorder_enabled; + } + + void settings_page::set_postorder_enabled(bool is_enabled) + { + if (m_config.postorder_enabled != is_enabled) + { + change_postorder_status(m_config, is_enabled); + emit onPostOrderEnabledChanged(); + } + } + bool atomic_dex::settings_page::is_notification_enabled() const { return m_config.notification_enabled; diff --git a/src/core/atomicdex/pages/qt.settings.page.hpp b/src/core/atomicdex/pages/qt.settings.page.hpp index 5ce98412a7..fa37ddd804 100644 --- a/src/core/atomicdex/pages/qt.settings.page.hpp +++ b/src/core/atomicdex/pages/qt.settings.page.hpp @@ -46,6 +46,7 @@ namespace atomic_dex Q_PROPERTY(QString current_fiat READ get_current_fiat WRITE set_current_fiat NOTIFY onFiatChanged) Q_PROPERTY(bool notification_enabled READ is_notification_enabled WRITE set_notification_enabled NOTIFY onNotificationEnabledChanged) Q_PROPERTY(bool spamfilter_enabled READ is_spamfilter_enabled WRITE set_spamfilter_enabled NOTIFY onSpamFilterEnabledChanged) + Q_PROPERTY(bool postorder_enabled READ is_postorder_enabled WRITE set_postorder_enabled NOTIFY onPostOrderEnabledChanged) Q_PROPERTY(bool static_rpcpass_enabled READ is_static_rpcpass_enabled WRITE set_static_rpcpass_enabled NOTIFY onStaticRpcPassEnabledChanged) Q_PROPERTY(QVariant custom_token_data READ get_custom_token_data WRITE set_custom_token_data NOTIFY customTokenDataChanged) Q_PROPERTY(bool fetching_custom_token_data_busy READ is_fetching_custom_token_data_busy WRITE set_fetching_custom_token_data_busy NOTIFY customTokenDataStatusChanged) @@ -94,6 +95,8 @@ namespace atomic_dex bool set_zhtlc_status(nlohmann::json data); [[nodiscard]] bool is_spamfilter_enabled() const; void set_spamfilter_enabled(bool is_enabled); + [[nodiscard]] bool is_postorder_enabled() const; + void set_postorder_enabled(bool is_enabled); void set_current_currency(const QString& current_currency); void set_current_fiat(const QString& current_fiat); [[nodiscard]] bool is_fetching_custom_token_data_busy() const; @@ -143,6 +146,7 @@ namespace atomic_dex void onFiatSignChanged(); void onFiatChanged(); void onNotificationEnabledChanged(); + void onPostOrderEnabledChanged(); void onSpamFilterEnabledChanged(); void onStaticRpcPassEnabledChanged(); void customTokenDataChanged(); From fba9f541581f934adfb7eb41a8c469189e2fc5a3 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Jun 2024 22:15:15 +0800 Subject: [PATCH 06/14] add config entry --- assets/config/cfg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/config/cfg.json b/assets/config/cfg.json index fef919e6a1..96f255bc23 100644 --- a/assets/config/cfg.json +++ b/assets/config/cfg.json @@ -1,6 +1,7 @@ { "notification_enabled": true, "spamfilter_enabled": false, + "postorder_enabled": false, "use_static_rpcpass": false, "current_currency": "USD", "current_fiat": "USD", From a5aa4b97f0f90c8bffe5e58b127d2405a0206732 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Jun 2024 23:10:44 +0800 Subject: [PATCH 07/14] increment to v0.7.2 --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/workflows/atomicdex-desktop-cd.yml | 2 +- .github/workflows/atomicdex-desktop-ci.yml | 2 +- CMakeLists.txt | 2 +- cmake/project.metadata.cmake | 2 +- src/core/atomicdex/version/version.hpp | 8 ++++---- vcpkg.json | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 978061b1c7..623343db29 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,7 +26,7 @@ Please describe what you expected to happen. **Operating Environment(s):** - OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ] - OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ] - - Komodo Wallet Version: [e.g. 0.7.1] + - Komodo Wallet Desktop Version: [e.g. 0.7.2] - Build branch: [e.g. master/dev] diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml index dfe7a31318..ae77398d5a 100644 --- a/.github/workflows/atomicdex-desktop-cd.yml +++ b/.github/workflows/atomicdex-desktop-cd.yml @@ -9,7 +9,7 @@ env: DEX_PROJECT_NAME: "komodo-wallet" DEX_DISPLAY_NAME: "Komodo Wallet" DEX_COMPANY: "KomodoPlatform" - DEX_VERSION: "0.7.1" + DEX_VERSION: "0.7.2" DEX_WEBSITE: "https://atomicdex.io/" jobs: diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 5891f093e6..63a4fa44b1 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -17,7 +17,7 @@ env: DEX_PROJECT_NAME: "komodo-wallet" DEX_DISPLAY_NAME: "Komodo Wallet" DEX_COMPANY: "KomodoPlatform" - DEX_VERSION: "0.7.1" + DEX_VERSION: "0.7.2" DEX_WEBSITE: "https://atomicdex.io/" VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache VCPKG_BINARY_SOURCES: clear;x-gha,readwrite diff --git a/CMakeLists.txt b/CMakeLists.txt index fd398a00e7..efbce5181f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ include(vcpkg_prerequisites) include(qt_prerequisites) include(cfg_hash) -project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.7.1) +project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.7.2) message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}") include(cmake_default_options) diff --git a/cmake/project.metadata.cmake b/cmake/project.metadata.cmake index 12916bef13..ea2771af2f 100644 --- a/cmake/project.metadata.cmake +++ b/cmake/project.metadata.cmake @@ -7,7 +7,7 @@ set(DEX_DISPLAY_NAME "Komodo Wallet") set(DEX_MAINTENANCE_TOOL_NAME "Komodo Wallet Maintenance Tool") set(DEX_COMPANY "KomodoPlatform") set(DEX_WEBSITE "https://atomicdex.io/") -set(DEX_VERSION "0.7.1") +set(DEX_VERSION "0.7.2") set(DEX_SUPPORT_PAGE "https://support.komodoplatform.com/support/home") set(DEX_DISCORD "https://komodoplatform.com/discord") set(DEX_TWITTER "https://twitter.com/AtomicDEX") diff --git a/src/core/atomicdex/version/version.hpp b/src/core/atomicdex/version/version.hpp index e329b417e0..55dd6fcdd0 100644 --- a/src/core/atomicdex/version/version.hpp +++ b/src/core/atomicdex/version/version.hpp @@ -21,24 +21,24 @@ namespace atomic_dex constexpr const char* get_version() { - return "0.7.1-beta"; + return "0.7.2-beta"; } constexpr int get_num_version() noexcept { - return 71; + return 72; } constexpr const char* get_raw_version() { - return "0.7.1"; + return "0.7.2"; } constexpr const char* get_precedent_raw_version() { - return "0.7.0"; + return "0.7.1"; } } // namespace atomic_dex diff --git a/vcpkg.json b/vcpkg.json index 0376005b92..6d6777bd47 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { - "name": "komodo-wallet", - "version-string": "0.7.1", + "name": "komodo-wallet-desktop", + "version-string": "0.7.2", "dependencies": [ "entt", "boost-multiprecision", From 70c4d1c9f635338771d6d495012471ec144e3993 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Jun 2024 23:29:05 +0800 Subject: [PATCH 08/14] add VOTE2024 to default enabled coins --- src/core/atomicdex/constants/dex.constants.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/atomicdex/constants/dex.constants.hpp b/src/core/atomicdex/constants/dex.constants.hpp index 7cda6d1817..99ed0c8c23 100644 --- a/src/core/atomicdex/constants/dex.constants.hpp +++ b/src/core/atomicdex/constants/dex.constants.hpp @@ -12,6 +12,7 @@ namespace atomic_dex g_second_primary_dex_coin, "BTC-segwit", "DGB-segwit", + "VOTE2024", }; inline const std::vector g_faucet_coins{ "DOC", From 900b698f7ee82c5b98642441211c6df17facf080 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Jun 2024 23:42:27 +0800 Subject: [PATCH 09/14] update vote info link --- atomic_defi_design/Dex/Wallet/Main.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Wallet/Main.qml b/atomic_defi_design/Dex/Wallet/Main.qml index a6dd531cd7..e53fa86e26 100644 --- a/atomic_defi_design/Dex/Wallet/Main.qml +++ b/atomic_defi_design/Dex/Wallet/Main.qml @@ -675,7 +675,10 @@ Item content.anchors.leftMargin: enabled ? 23 : 48 content.anchors.rightMargin: 23 - onClicked: Qt.openUrlExternally("https://vote.komodoplatform.com/") + onClicked: { + let url = "https://vote.komodoplatform.com/" + api_wallet_page.ticker.toLowerCase(); + Qt.openUrlExternally(url); + } Row { From cb540f863fd92b95c4fef4f19d8c54a5a4f556ce Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Jun 2024 23:58:39 +0800 Subject: [PATCH 10/14] trailing / for url --- atomic_defi_design/Dex/Wallet/Main.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Wallet/Main.qml b/atomic_defi_design/Dex/Wallet/Main.qml index e53fa86e26..7028d16c2b 100644 --- a/atomic_defi_design/Dex/Wallet/Main.qml +++ b/atomic_defi_design/Dex/Wallet/Main.qml @@ -676,7 +676,7 @@ Item content.anchors.rightMargin: 23 onClicked: { - let url = "https://vote.komodoplatform.com/" + api_wallet_page.ticker.toLowerCase(); + let url = "https://vote.komodoplatform.com/" + api_wallet_page.ticker.toLowerCase() + "/"; Qt.openUrlExternally(url); } From 26ac678afeb6946f48f1efa0d85e157fccb8aa5c Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 14 Jun 2024 08:35:09 +0800 Subject: [PATCH 11/14] fix deprecated syntax --- atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml index e67d03e6e0..97aa37dce7 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml @@ -73,13 +73,14 @@ Item Connections { target: API.app.trading_pg - onMarketModeChanged: { + + function onMarketModeChanged: { if (isAsk) quickscroll_timer.start() } - onOrderbookChanged: { + function onOrderbookChanged: { if (isAsk) quickscroll_timer.start() } - onMarketPairsChanged: { + function onMarketPairsChanged: { if (isAsk) quickscroll_timer.start() } } From f2b86e03eb677c11420bde28644f71ba402041e2 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 14 Jun 2024 19:01:04 +0800 Subject: [PATCH 12/14] fix connection triggger function syntax --- .../Dex/Exchange/Trade/OrderBook/List.qml | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml index 97aa37dce7..8807c1a69c 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/List.qml @@ -72,16 +72,28 @@ Item } Connections { - target: API.app.trading_pg + target: API.app.trading_pg; - function onMarketModeChanged: { - if (isAsk) quickscroll_timer.start() + function onMarketModeChanged() + { + if (isAsk) + { + quickscroll_timer.start() + } } - function onOrderbookChanged: { - if (isAsk) quickscroll_timer.start() + function onOrderbookChanged() + { + if (isAsk) + { + quickscroll_timer.start() + } } - function onMarketPairsChanged: { - if (isAsk) quickscroll_timer.start() + function onMarketPairsChanged() + { + if (isAsk) + { + quickscroll_timer.start() + } } } } \ No newline at end of file From f42cd63c487fcc534374db126864900ab0105bff Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 18 Jun 2024 18:45:38 +0800 Subject: [PATCH 13/14] use windows 2019 runner image --- .github/workflows/atomicdex-desktop-cd.yml | 4 ++-- .github/workflows/atomicdex-desktop-ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml index dfe7a31318..0faeb91590 100644 --- a/.github/workflows/atomicdex-desktop-cd.yml +++ b/.github/workflows/atomicdex-desktop-cd.yml @@ -367,7 +367,7 @@ jobs: windows-release: name: Win Build/Release - runs-on: windows-latest + runs-on: windows-2019 steps: - uses: actions/checkout@v2 @@ -445,7 +445,7 @@ jobs: windows-debug: name: Win Build/Debug - runs-on: windows-latest + runs-on: windows-2019 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 5891f093e6..72792fc142 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -68,13 +68,13 @@ jobs: host: 'mac' - name: windows-release - os: windows-latest + os: windows-2019 qt: '5.15.2' type: 'Release' host: 'windows' - name: windows-debug - os: windows-latest + os: windows-2019 qt: '5.15.2' type: 'Debug' host: 'windows' From d5d378be88a47de65551b694d811ce28f1ef8a86 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 19 Jun 2024 00:16:51 +0800 Subject: [PATCH 14/14] use gh release kdf --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd398a00e7..28964d287b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,13 +60,13 @@ endif () ##! We fetch our dependencies if (APPLE) FetchContent_Declare(mm2 - URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-mac-x86-64.zip) + URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Darwin-Release.zip) elseif (UNIX AND NOT APPLE) FetchContent_Declare(mm2 - URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-linux-x86-64.zip) + URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Linux-Release.zip) else () FetchContent_Declare(mm2 - URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-win-x86-64.zip) + URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Win64.zip) endif () #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)