Merge pull request #1 from KomodoPlatform/dev

update to 5.5
KomodoPlatform · Mar 6, 2022 · f98bdc1 · f98bdc1
2 parents 58c595f + e0a40e0
commit f98bdc1
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 34 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -3,7 +3,7 @@ name: Bug report
 about: Create a report to help us improve
 title: "[BUG]: "
 labels: bug
-assignees: Milerius, tonymorony
+assignees: ''
 
 ---
 

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -3,7 +3,7 @@ name: Feature request
 about: Suggest an idea for this project
 title: "[FEATURE REQUEST]: "
 labels: ''
-assignees: Milerius, tonymorony
+assignees: ''
 
 ---
 

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.5.4)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.5)
 message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
 
 include(cmake_default_options)

diff --git a/assets/config/0.5.4-coins.json → assets/config/0.5.5-coins.json b/assets/config/0.5.4-coins.json → assets/config/0.5.5-coins.json
@@ -4669,8 +4669,10 @@
       }
     ],
     "explorer_url": [
-      "https://usdiexplorer.com/"
+      "https://chainz.cryptoid.info/usdi/"
     ],
+    "explorer_tx_url": "tx.dws?",
+    "explorer_address_url": "address.dws?",
     "type": "UTXO",
     "active": false,
     "currently_enabled": false
@@ -5433,11 +5435,7 @@
       {
         "url": "electrumx.live:50010",
         "protocol": "TCP"
-      },
-      {
-        "url": "electrumxprux02.sytes.net:50001",
-        "protocol": "TCP"
-      }	  	      
+      }
       ],
       "explorer_url": [
         "https://explorer.prux.info/"

diff --git a/atomic_defi_design/Dex/Components/DexTextField.qml b/atomic_defi_design/Dex/Components/DexTextField.qml
@@ -12,6 +12,7 @@ TextField
     property alias right_text: right_text.text_value
     property alias radius: background.radius
     property alias backgroundColor: background.color
+    property bool forceFocus: false
 
     font: DexTypo.body2
     placeholderTextColor: Dex.CurrentTheme.textPlaceholderColor
@@ -74,4 +75,9 @@ TextField
         color: Dex.CurrentTheme.textFieldSuffixColor
         font.pixelSize: text_field.font.pixelSize
     }
+
+    Component.onCompleted:
+    {
+        if (forceFocus) text_field.forceActiveFocus()
+    }
 }
diff --git a/atomic_defi_design/Dex/Settings/SettingModal.qml b/atomic_defi_design/Dex/Settings/SettingModal.qml
@@ -527,8 +527,8 @@ Qaterial.Dialog
                                 {
                                     Layout.alignment: Qt.AlignVCenter
                                     text: API.app.settings_pg.get_version()
-                                    onCopyNotificationTitle: qsTr("DEX Version")
-                                    onCopyNotificationMsg: qsTr("DEX Version copied to clipboard.")
+                                    onCopyNotificationTitle: qsTr("Application Version")
+                                    onCopyNotificationMsg: qsTr("copied to clipboard")
                                 }
                             }
                             RowLayout

diff --git a/atomic_defi_design/Dex/Sidebar/FigurativeLine.qml b/atomic_defi_design/Dex/Sidebar/FigurativeLine.qml
@@ -22,8 +22,8 @@ Line
         anchors.fill: _icon
         source: _icon
         color: !_icon.enabled ? Dex.CurrentTheme.textDisabledColor :
-               mouseArea.containsMouse && currentLineType !== type ? Dex.CurrentTheme.sidebarLineTextHovered :
-               currentLineType === type ?                            Dex.CurrentTheme.sidebarLineTextSelected :
-                                                                     Dex.CurrentTheme.foregroundColor
+               mouseArea.containsMouse && currentLineType !== type       ? Dex.CurrentTheme.sidebarLineTextHovered :
+               currentLineType === type && type != Main.LineType.Support ? Dex.CurrentTheme.sidebarLineTextSelected :
+                                                                           Dex.CurrentTheme.foregroundColor
     }
 }
diff --git a/atomic_defi_design/Dex/Sidebar/Line.qml b/atomic_defi_design/Dex/Sidebar/Line.qml
@@ -35,10 +35,10 @@ Item
             weight: Font.Normal
         })
         style: Text.Normal
-        color: !enabled ?                                             Dex.CurrentTheme.textDisabledColor :
-               _mouseArea.containsMouse && currentLineType !== type ? Dex.CurrentTheme.sidebarLineTextHovered :
-               currentLineType === type ?                             Dex.CurrentTheme.sidebarLineTextSelected :
-                                                                      Dex.CurrentTheme.foregroundColor
+        color: !enabled                                                  ? Dex.CurrentTheme.textDisabledColor :
+               _mouseArea.containsMouse && currentLineType !== type      ? Dex.CurrentTheme.sidebarLineTextHovered :
+               currentLineType === type && type != Main.LineType.Support ? Dex.CurrentTheme.sidebarLineTextSelected :
+                                                                           Dex.CurrentTheme.foregroundColor
     }
 
     DexMouseArea

diff --git a/atomic_defi_design/Dex/Support/Support.qml b/atomic_defi_design/Dex/Support/Support.qml
@@ -11,6 +11,8 @@ import App 1.0
 Item {
     id: root
 
+    readonly property bool update_needed: API.app.self_update_service.update_needed
+
     DexFlickable {
         id: layout_background
 

diff --git a/atomic_defi_design/Dex/Wallet/SendModal.qml b/atomic_defi_design/Dex/Wallet/SendModal.qml
@@ -285,6 +285,7 @@ BasicModal
 
             placeholderText: qsTr("Address of the recipient")
             onTextChanged: api_wallet_page.validate_address(text)
+            forceFocus: true
 
             Rectangle
             {
@@ -451,7 +452,7 @@ BasicModal
                     }
                     else if (_preparePage.cryptoSendMode)
                     {
-                        return qsTr("Fiat amount: %1%2").arg(API.app.settings_pg.current_fiat_sign).arg(value);
+                        return qsTr("Fiat amount: %1").arg(General.formatFiat('', value, API.app.settings_pg.current_fiat_sign));
                     }
                     else
                     {
@@ -506,15 +507,16 @@ BasicModal
 
                     DefaultText
                     {
-                        visible: _preparePage.cryptoSendMode
+                        id: fiat_symbol
+                        visible: _preparePage.cryptoSendMode && API.app.settings_pg.current_currency_sign != "KMD"
                         font.pixelSize: 18
                         anchors.centerIn: parent
-                        text: API.app.settings_pg.current_fiat_sign
+                        text: API.app.settings_pg.current_currency_sign
                     }
 
                     DefaultImage
                     {
-                        visible: !_preparePage.cryptoSendMode
+                        visible: !fiat_symbol.visible
                         anchors.centerIn: parent
                         width: 18
                         height: 18
@@ -730,7 +732,7 @@ BasicModal
             title: qsTr("Amount")
             text: empty_data ? "" : "%1 %2 (%3 %4)"
                 .arg(api_wallet_page.ticker)
-                .arg(getCryptoAmount() !== "" ? getCryptoAmount() : result.balance_change)
+                .arg(getCryptoAmount())
                 .arg(API.app.settings_pg.current_fiat_sign)
                 .arg(send_result.withdraw_answer.total_amount_fiat)
         }

diff --git a/ci_tools_atomic_dex/installer/osx/config/config.xml.in b/ci_tools_atomic_dex/installer/osx/config/config.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>${DEX_DISPLAY_NAME}</Name>
-    <Version>0.5.4</Version>
+    <Version>0.5.5</Version>
     <Title>${DEX_DISPLAY_NAME} Installer</Title>
     <ProductUrl>${DEX_WEBSITE}</ProductUrl>
     <Publisher>${DEX_COMPANY}</Publisher>

diff --git a/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in
@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>${DEX_DISPLAY_NAME}</DisplayName>
     <Description>Install ${DEX_DISPLAY_NAME}.</Description>
-    <Version>0.5.4</Version>
+    <Version>0.5.5</Version>
     <ReleaseDate>2021-12-06</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License v2.0" file="license.txt" />

diff --git a/ci_tools_atomic_dex/installer/windows/config/config.xml.in b/ci_tools_atomic_dex/installer/windows/config/config.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>@DEX_DISPLAY_NAME@</Name>
-    <Version>0.5.4</Version>
+    <Version>0.5.5</Version>
     <Title>@DEX_DISPLAY_NAME@ Installer</Title>
     <ProductUrl>@DEX_WEBSITE@</ProductUrl>
     <Publisher>@DEX_COMPANY@</Publisher>

diff --git a/...ls_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/...ls_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in
@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>${DEX_DISPLAY_NAME}</DisplayName>
     <Description>Install ${DEX_DISPLAY_NAME}.</Description>
-    <Version>0.5.4</Version>
+    <Version>0.5.5</Version>
     <ReleaseDate>2021-12-06</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License v2.0" file="license.txt" />

diff --git a/cmake/install/macos/dex_install.cmake b/cmake/install/macos/dex_install.cmake
@@ -4,8 +4,8 @@ if (APPLE)
             MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
             RESOURCE ${ICON}
             MACOSX_BUNDLE_ICON_FILE dex-logo
-            MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.4
-            MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.4
+            MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.5
+            MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.5
             MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in")
     add_custom_command(TARGET ${PROJECT_NAME}
             POST_BUILD COMMAND

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.5.4-beta";
+        return "0.5.5-beta";
     }
 
     constexpr int
     get_num_version() noexcept
     {
-        return 54;
+        return 55;
     }
 
     constexpr const char*
     get_raw_version()
     {
-        return "0.5.4";
+        return "0.5.5";
     }
 
     constexpr const char*
     get_precedent_raw_version()
     {
-        return "0.5.3";
+        return "0.5.4";
     }
 } // namespace atomic_dex
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "atomicdex-desktop",
-  "version-string": "0.5.4",
+  "version-string": "0.5.5",
   "dependencies": [
     "entt",
     "boost-multiprecision",