diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 2f0984199..3726e5872 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 Desktop Version: [e.g. 0.8.1] + - Komodo Wallet Desktop Version: [e.g. 0.8.2] - Build branch: [e.g. master/dev] diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml index 679363b76..df7e64b07 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.8.1" + DEX_VERSION: "0.8.2" DEX_WEBSITE: "https://atomicdex.io/" jobs: diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 794c6b58d..c4d914254 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.8.1" + DEX_VERSION: "0.8.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 b3a18d2c4..f97391995 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.8.1) +project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.8.2) message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}") include(cmake_default_options) diff --git a/atomic_defi_design/Dex/Sidebar/Center.qml b/atomic_defi_design/Dex/Sidebar/Center.qml index a3e2586d9..b756baf71 100644 --- a/atomic_defi_design/Dex/Sidebar/Center.qml +++ b/atomic_defi_design/Dex/Sidebar/Center.qml @@ -47,7 +47,6 @@ MouseArea _walletLine.label.opacity = 0; _dexLine.label.opacity = 0; _addressBookLine.label.opacity = 0; - _fiatLine.label.opacity = 0; } } } @@ -55,7 +54,7 @@ MouseArea NumberAnimation { id: waitForSidebarExpansionAnimation - targets: [_portfolioLine.label, _walletLine.label, _dexLine.label, _addressBookLine.label, _fiatLine.label] + targets: [_portfolioLine.label, _walletLine.label, _dexLine.label, _addressBookLine.label] properties: "opacity" duration: 200 from: 0 @@ -66,7 +65,7 @@ MouseArea NumberAnimation { id: labelsOpacityAnimation - targets: [_portfolioLine.label, _walletLine.label, _dexLine.label, _addressBookLine.label, _fiatLine.label] + targets: [_portfolioLine.label, _walletLine.label, _dexLine.label, _addressBookLine.label] properties: "opacity" duration: 350 from: 0.0 @@ -107,11 +106,10 @@ MouseArea Layout.fillWidth: true type: Main.LineType.DEX - label.color: timesyncInfo ? Dex.CurrentTheme.foregroundColor : Dex.CurrentTheme.textDisabledColor - label.text: qsTr("DEX") // isExpanded ? qsTr("DEX") : "" + label.color: timesyncInfo ? Dex.CurrentTheme.textDisabledColor : Dex.CurrentTheme.textDisabledColor + label.text: qsTr("DEX") icon.source: General.image_path + "menu-exchange-white.svg" - onClicked: timesyncInfo ? lineSelected(type) : null - disabled_tt_text: timesyncInfo ? "" : qsTr("DEX is disabled due to system clock synchronization issues. Please check your device time settings.") + disabled_tt_text: qsTr("DEX is temporarily disabled. Please check https://komodoplatform.com/en/blog/ for more details.") } FigurativeLine @@ -124,16 +122,5 @@ MouseArea icon.source: General.image_path + "menu-news-white.svg" onClicked: lineSelected(type) } - - FigurativeLine - { - id: _fiatLine - - label.enabled: false - icon.enabled: false - Layout.fillWidth: true - label.text: qsTr("Fiat") // isExpanded ? qsTr("Fiat") : "" - icon.source: General.image_path + "bill.svg" - } } } diff --git a/atomic_defi_design/Dex/Sidebar/Main.qml b/atomic_defi_design/Dex/Sidebar/Main.qml index c36fb5b89..4e5c8092a 100644 --- a/atomic_defi_design/Dex/Sidebar/Main.qml +++ b/atomic_defi_design/Dex/Sidebar/Main.qml @@ -108,6 +108,8 @@ Item anchors.topMargin: 70 onLineSelected: { + if (lineType === Main.LineType.DEX) + return; if (currentLineType === lineType) return; currentLineType = lineType; diff --git a/atomic_defi_design/Dex/Wallet/Main.qml b/atomic_defi_design/Dex/Wallet/Main.qml index dc90d3a15..f8afef954 100644 --- a/atomic_defi_design/Dex/Wallet/Main.qml +++ b/atomic_defi_design/Dex/Wallet/Main.qml @@ -522,6 +522,7 @@ Item { Layout.preferredWidth: 165 Layout.preferredHeight: 40 + visible: false DefaultButton { diff --git a/cmake/project.metadata.cmake b/cmake/project.metadata.cmake index d4001dfd3..ecba33335 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.8.1") +set(DEX_VERSION "0.8.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 11c2aac03..747cf9a5f 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.8.1-beta"; + return "0.8.2-beta"; } constexpr int get_num_version() noexcept { - return 81; + return 82; } constexpr const char* get_raw_version() { - return "0.8.1"; + return "0.8.2"; } constexpr const char* get_precedent_raw_version() { - return "0.8.0"; + return "0.8.1"; } } // namespace atomic_dex diff --git a/vcpkg.json b/vcpkg.json index 031888ed4..16191dd43 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "komodo-wallet-desktop", - "version-string": "0.8.1", + "version-string": "0.8.2", "dependencies": [ "entt", "boost-multiprecision", diff --git a/version.json b/version.json index d1ee07cab..7b5d0749d 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "0.8.1", - "update": "recommended" + "version": "0.8.2", + "update": "required" } \ No newline at end of file