From 8b0014d841728202ed93133745a2ab502ab11ef0 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 13 Jan 2025 20:58:43 +0800 Subject: [PATCH 1/5] Only show update pop up if update needed --- atomic_defi_design/Dex/NewUpdateModal.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/atomic_defi_design/Dex/NewUpdateModal.qml b/atomic_defi_design/Dex/NewUpdateModal.qml index 1e3a13348..7b01a828d 100644 --- a/atomic_defi_design/Dex/NewUpdateModal.qml +++ b/atomic_defi_design/Dex/NewUpdateModal.qml @@ -160,8 +160,7 @@ Dex.MultipageModal console.log("updateInfo.changelog: " + Dex.API.app.updateCheckerService.updateInfo.changelog) if (Dex.API.app.updateCheckerService.updateInfo) { - let status = Dex.API.app.updateCheckerService.updateInfo.status - if (status === "recommended" || status === "required") + if (Dex.API.app.updateCheckerService.updateInfo.updateNeeded == true) { root.open() } From afdf2d9c8a60105dfa19bd34cbf38f8986331b72 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 13 Jan 2025 20:58:58 +0800 Subject: [PATCH 2/5] remove url from tooltip --- atomic_defi_design/Dex/Sidebar/Center.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Sidebar/Center.qml b/atomic_defi_design/Dex/Sidebar/Center.qml index b756baf71..a7ab499d1 100644 --- a/atomic_defi_design/Dex/Sidebar/Center.qml +++ b/atomic_defi_design/Dex/Sidebar/Center.qml @@ -109,7 +109,7 @@ MouseArea label.color: timesyncInfo ? Dex.CurrentTheme.textDisabledColor : Dex.CurrentTheme.textDisabledColor label.text: qsTr("DEX") icon.source: General.image_path + "menu-exchange-white.svg" - disabled_tt_text: qsTr("DEX is temporarily disabled. Please check https://komodoplatform.com/en/blog/ for more details.") + disabled_tt_text: qsTr("DEX is temporarily disabled.") } FigurativeLine From 9164f6b9e94ec997c24dacf4460a246a3c4fbc6f Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 13 Jan 2025 22:20:41 +0800 Subject: [PATCH 3/5] fix sidebar overlay --- atomic_defi_design/Dex/Sidebar/Center.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Sidebar/Center.qml b/atomic_defi_design/Dex/Sidebar/Center.qml index a7ab499d1..653720aba 100644 --- a/atomic_defi_design/Dex/Sidebar/Center.qml +++ b/atomic_defi_design/Dex/Sidebar/Center.qml @@ -12,7 +12,7 @@ MouseArea signal lineSelected(var lineType) - height: lineHeight * 5 + height: lineHeight * 4 hoverEnabled: true Connections From 139f6e5422b79e161c1235f23357260b3407db3d Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 14 Jan 2025 15:48:34 +0800 Subject: [PATCH 4/5] gui_auth -> komodo_proxy --- atomic_defi_design/Dex/NewUpdateModal.qml | 13 ++++++++++--- src/core/atomicdex/config/enable.cfg.cpp | 8 ++++---- src/core/atomicdex/config/enable.cfg.hpp | 2 +- .../services/update/update.checker.service.cpp | 9 +++------ 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/atomic_defi_design/Dex/NewUpdateModal.qml b/atomic_defi_design/Dex/NewUpdateModal.qml index 7b01a828d..cbfb3f04a 100644 --- a/atomic_defi_design/Dex/NewUpdateModal.qml +++ b/atomic_defi_design/Dex/NewUpdateModal.qml @@ -23,10 +23,17 @@ Dex.MultipageModal Component.onCompleted: { - let status = Dex.API.app.updateCheckerService.updateInfo.status - if ( status === "recommended" || status === "required") + if (Dex.API.app.updateCheckerService.updateInfo) { - root.open() + console.log("init updateInfo.status: " + Dex.API.app.updateCheckerService.updateInfo.status) + console.log("init updateInfo.updateNeeded: " + Dex.API.app.updateCheckerService.updateInfo.updateNeeded) + console.log("init updateInfo.newVersion: " + Dex.API.app.updateCheckerService.updateInfo.newVersion) + console.log("init updateInfo.downloadUrl: " + Dex.API.app.updateCheckerService.updateInfo.downloadUrl) + console.log("init updateInfo.changelog: " + Dex.API.app.updateCheckerService.updateInfo.changelog) + if (Dex.API.app.updateCheckerService.updateInfo.updateNeeded == true) + { + root.open() + } } } diff --git a/src/core/atomicdex/config/enable.cfg.cpp b/src/core/atomicdex/config/enable.cfg.cpp index 47580a3f1..c569c9df2 100644 --- a/src/core/atomicdex/config/enable.cfg.cpp +++ b/src/core/atomicdex/config/enable.cfg.cpp @@ -27,9 +27,9 @@ namespace atomic_dex to_json(nlohmann::json& j, const node& cfg) { j["url"] = cfg.url; - if (cfg.gui_auth.has_value()) + if (cfg.komodo_proxy.has_value()) { - j["gui_auth"] = cfg.gui_auth.value(); + j["komodo_proxy"] = cfg.komodo_proxy.value(); } } @@ -37,9 +37,9 @@ namespace atomic_dex from_json(const nlohmann::json& j, node& cfg) { j.at("url").get_to(cfg.url); - if (j.count("gui_auth") == 1) + if (j.count("komodo_proxy") == 1) { - cfg.gui_auth = j.at("gui_auth").get(); + cfg.komodo_proxy = j.at("komodo_proxy").get(); } } } // namespace atomic_dex \ No newline at end of file diff --git a/src/core/atomicdex/config/enable.cfg.hpp b/src/core/atomicdex/config/enable.cfg.hpp index 94e11e773..043055e4d 100644 --- a/src/core/atomicdex/config/enable.cfg.hpp +++ b/src/core/atomicdex/config/enable.cfg.hpp @@ -26,7 +26,7 @@ namespace atomic_dex struct node { std::string url; - std::optional gui_auth{false}; + std::optional komodo_proxy{false}; }; void to_json(nlohmann::json& j, const node& cfg); diff --git a/src/core/atomicdex/services/update/update.checker.service.cpp b/src/core/atomicdex/services/update/update.checker.service.cpp index 36201037f..3a2ea7992 100644 --- a/src/core/atomicdex/services/update/update.checker.service.cpp +++ b/src/core/atomicdex/services/update/update.checker.service.cpp @@ -105,14 +105,11 @@ namespace atomic_dex emit isFetchingChanged(); async_check_retrieve() .then([this](web::http::http_response resp) { - nlohmann::json result = process_update_info_resp(resp); - this->m_update_info = result; + this->m_update_info = process_update_info_resp(resp); + SPDLOG_INFO("UpdateInfo has updated...") is_fetching = false; emit isFetchingChanged(); - if (result["updateNeeded"] == true) - { - emit updateInfoChanged(); - } + emit updateInfoChanged(); }) .then(&handle_exception_pplx_task); } From cd31e7fb9f4772f355c0497b6da52fee0eb373de Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 14 Jan 2025 16:47:29 +0800 Subject: [PATCH 5/5] missing ; --- src/core/atomicdex/services/update/update.checker.service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/atomicdex/services/update/update.checker.service.cpp b/src/core/atomicdex/services/update/update.checker.service.cpp index 3a2ea7992..f8123dd7d 100644 --- a/src/core/atomicdex/services/update/update.checker.service.cpp +++ b/src/core/atomicdex/services/update/update.checker.service.cpp @@ -106,7 +106,7 @@ namespace atomic_dex async_check_retrieve() .then([this](web::http::http_response resp) { this->m_update_info = process_update_info_resp(resp); - SPDLOG_INFO("UpdateInfo has updated...") + SPDLOG_INFO("UpdateInfo has updated..."); is_fetching = false; emit isFetchingChanged(); emit updateInfoChanged();