Merge branch 'dev' into firoorg-dev

KomodoPlatform · Jan 20, 2024 · a874e1b · a874e1b
2 parents 9a8c542 + d0a4478
commit a874e1b
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git 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/firodex-desktop-cd.yml b/.github/workflows/firodex-desktop-cd.yml
@@ -9,7 +9,7 @@ env:
   DEX_PROJECT_NAME: "firodex-desktop"
   DEX_DISPLAY_NAME: "FiroDex Desktop"
   DEX_COMPANY: "Firo Core Team"
-  DEX_VERSION: "0.7.0"
+  DEX_VERSION: "0.7.1"
   DEX_WEBSITE: "https://firo.org/"
 
 jobs:

diff --git a/.github/workflows/firodex-desktop-ci.yml b/.github/workflows/firodex-desktop-ci.yml
@@ -17,7 +17,7 @@ env:
   DEX_PROJECT_NAME: "firodex"
   DEX_DISPLAY_NAME: "Firo Dex"
   DEX_COMPANY: "Firo"
-  DEX_VERSION: "0.7.0"
+  DEX_VERSION: "0.7.1"
   DEX_WEBSITE: "https://firo.org/"
   VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
   VCPKG_BINARY_SOURCES: clear;x-gha,readwrite

diff --git 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/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)
                     }
                 }
 

diff --git a/cmake/project.metadata.cmake b/cmake/project.metadata.cmake
@@ -6,7 +6,7 @@ set(DEX_PROJECT_NAME "firodex")
 set(DEX_DISPLAY_NAME "Firo Dex")
 set(DEX_MAINTENANCE_TOOL_NAME "Firo Dex Maintenance Tool")
 set(DEX_COMPANY "Firo")
-set(DEX_VERSION "0.7.0")
+set(DEX_VERSION "0.7.1")
 set(DEX_WEBSITE "https://firo.org/")
 set(DEX_SUPPORT_PAGE "https://firo.org/guide/")
 set(DEX_DISCORD "https://discord.com/invite/TGZPRbRT3Y")

diff --git 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;

diff --git 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
@@ -1,6 +1,6 @@
 {
   "name": "firodex-wallet",
-  "version-string": "0.7.0",
+  "version-string": "0.7.1",
   "dependencies": [
     "entt",
     "boost-multiprecision",