From a5aa4b97f0f90c8bffe5e58b127d2405a0206732 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Jun 2024 23:10:44 +0800 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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); }