From ba1371b4bc8456ef348a0eb3a8facbdae883f4a9 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 10 Jan 2024 16:58:51 +0800 Subject: [PATCH 1/3] fix symbol/text usage for selected fiat in send form --- atomic_defi_design/Dex/Wallet/SendModal.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atomic_defi_design/Dex/Wallet/SendModal.qml b/atomic_defi_design/Dex/Wallet/SendModal.qml index 2fcd8effc9..aedb0f7682 100644 --- a/atomic_defi_design/Dex/Wallet/SendModal.qml +++ b/atomic_defi_design/Dex/Wallet/SendModal.qml @@ -509,7 +509,7 @@ MultipageModal { id: fiat_symbol visible: _preparePage.cryptoSendMode && API.app.settings_pg.current_currency_sign != "KMD" - font.pixelSize: 18 + font.pixelSize: API.app.settings_pg.current_currency_sign.length == 1 ? 18 : 18 - API.app.settings_pg.current_currency_sign.length * 2 anchors.centerIn: parent text: API.app.settings_pg.current_currency_sign } @@ -520,7 +520,7 @@ MultipageModal anchors.centerIn: parent width: 18 height: 18 - source: General.coinIcon(API.app.wallet_pg.ticker) + source: _preparePage.cryptoSendMode ? General.coinIcon(API.app.settings_pg.current_currency_sign) : General.coinIcon(API.app.wallet_pg.ticker) } } From 2afb2880999713a2880b9d77e90a74f4b5d29ab4 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 18 Jan 2024 20:44:33 +0800 Subject: [PATCH 2/3] default is_testnet should be false --- src/core/atomicdex/pages/qt.settings.page.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/atomicdex/pages/qt.settings.page.cpp b/src/core/atomicdex/pages/qt.settings.page.cpp index 9ff8af5085..35ac7792d5 100644 --- a/src/core/atomicdex/pages/qt.settings.page.cpp +++ b/src/core/atomicdex/pages/qt.settings.page.cpp @@ -647,7 +647,7 @@ namespace atomic_dex out["adex_cfg"][ticker]["explorer_url"] = coin_info.explorer_url; out["adex_cfg"][ticker]["fallback_swap_contract"] = coin_info.swap_contract_address; out["adex_cfg"][ticker]["fname"] = name_lowercase; - out["adex_cfg"][ticker]["is_testnet"] = true; + out["adex_cfg"][ticker]["is_testnet"] = false; out["adex_cfg"][ticker]["currently_enabled"] = false; out["adex_cfg"][ticker]["mm2"] = 1; out["adex_cfg"][ticker]["name"] = name_lowercase; From e70bb91ae4370e4f5310046382fe7bef2d02d196 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 18 Jan 2024 21:38:13 +0800 Subject: [PATCH 3/3] version increment --- .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 | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 900c2817e3..978061b1c7 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.0] + - Komodo Wallet Version: [e.g. 0.7.1] - Build branch: [e.g. master/dev] diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml index afce755f88..dfe7a31318 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.0" + DEX_VERSION: "0.7.1" DEX_WEBSITE: "https://atomicdex.io/" jobs: diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index b8d0c2985f..8cdaa94d95 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -16,7 +16,7 @@ env: DEX_PROJECT_NAME: "komodo-wallet" DEX_DISPLAY_NAME: "Komodo Wallet" DEX_COMPANY: "KomodoPlatform" - DEX_VERSION: "0.7.0" + DEX_VERSION: "0.7.1" 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 01d3b3eeb8..fd398a00e7 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.0) +project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.7.1) 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 303c204bc2..12916bef13 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.0") +set(DEX_VERSION "0.7.1") 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 a3126acaa9..e329b417e0 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.0-beta"; + return "0.7.1-beta"; } constexpr int get_num_version() noexcept { - return 70; + return 71; } constexpr const char* get_raw_version() { - return "0.7.0"; + return "0.7.1"; } constexpr const char* get_precedent_raw_version() { - return "0.6.1"; + return "0.7.0"; } } // namespace atomic_dex diff --git a/vcpkg.json b/vcpkg.json index 7646297296..0376005b92 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "komodo-wallet", - "version-string": "0.7.0", + "version-string": "0.7.1", "dependencies": [ "entt", "boost-multiprecision",