merge dev and fix conflicts

.github/workflows/atomicdex-desktop-ci.yml

@@ -229,12 +229,12 @@ jobs:
           export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}"
           export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/clang_64/lib/cmake
           export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }}
-          export MACOSX_DEPLOYMENT_TARGET=10.13
+          export MACOSX_DEPLOYMENT_TARGET=10.15
           export CC=clang
           export CXX=clang++
           cd ci_tools_atomic_dex
           nimble build -y
-          ./ci_tools_atomic_dex bundle ${{ matrix.type }} --osx_sdk=$HOME/sdk/MacOSX10.14.sdk --compiler=clang++
+          ./ci_tools_atomic_dex bundle ${{ matrix.type }} --osx_sdk=$HOME/sdk/MacOSX10.15.sdk --compiler=clang++
 
 
       - name: Build AtomicDEX (Linux)

CMakeLists.txt

@@ -18,7 +18,6 @@ include(cmake_default_options)
 include(ipo_prerequisites)
 
 ##! Options
-option(PREFER_BOOST_FILESYSTEM "Enable to use boost filesystem instead of std::filesystem" OFF)
 option(WITH_HOTRELOAD "Enable to use qml Hot reload" OFF)
 
 if (NOT WITH_HOTRELOAD)

assets/themes/Binance - Dark/colors.json

@@ -28,6 +28,7 @@
   "gradientButtonTextHoveredColor": "#000000FF",
   "gradientButtonTextPressedColor": "#000000FF",
 
+  "checkBoxTickColor": "#FFFFFFFF",
   "checkBoxGradientStartColor": "#cb9800FF",
   "checkBoxGradientEndColor": "#EBB514FF",
 

assets/themes/Default - Dark/colors.json

@@ -31,8 +31,9 @@
     "gradientButtonTextHoveredColor": "#FFFFFFFF",
     "gradientButtonTextPressedColor": "#FFFFFFFF",
 
-    "checkBoxGradientStartColor": "#8892EBFF",
-    "checkBoxGradientEndColor": "#9DD4F3FF",
+    "checkBoxTickColor": "#FFFFFFFF",
+    "checkBoxGradientStartColor": "#6673E3FF",
+    "checkBoxGradientEndColor": "#5EBBF0FF",
 
     "switchGradientStartColor": "#1D80B0FF",
     "switchGradientEndColor": "#5B69E6FF",

assets/themes/Default - Light/colors.json

@@ -28,6 +28,7 @@
     "gradientButtonTextHoveredColor": "#FFFFFFFF",
     "gradientButtonTextPressedColor": "#FFFFFFFF",
 
+    "checkBoxTickColor": "#456078FF",
     "checkBoxGradientStartColor": "#8892EBFF",
     "checkBoxGradientEndColor": "#9DD4F3FF",
 

atomic_defi_design/Dex/Addressbook/AddAddressForm.qml

@@ -118,16 +118,22 @@ Dex.Rectangle
                 showAssetStandards: useStandardsCheckBox.checked
             }
 
-            Dex.DefaultCheckBox
-            {
-                id: useStandardsCheckBox
-                Layout.preferredWidth: 150
-                Layout.fillHeight: true
-                Layout.leftMargin: 4
-                boxWidth: 22
-                boxHeight: 22
-                text: qsTr("Use standard network address")
-                font: Dex.DexTypo.caption
+            RowLayout {
+                id: rowLayout
+                spacing: 4
+                Dex.DefaultCheckBox
+                {
+                    id: useStandardsCheckBox
+                    Layout.preferredWidth: 30
+                    Layout.fillHeight: true
+                    Layout.leftMargin: 4
+                }
+                Dex.DefaultText {
+                    Layout.minimumWidth: 120
+                    Layout.maximumWidth: 120
+                    text: qsTr("Use standard network address")
+                    font: Dex.DexTypo.caption
+                }
             }
         }
 

atomic_defi_design/Dex/Components/DexCheckBox.qml

@@ -26,9 +26,9 @@ CheckBox
         id: _indicator
         anchors.verticalCenter: control.verticalCenter
 
-        implicitWidth: 26
-        implicitHeight: 26
-        radius: 20
+        implicitWidth: 20
+        implicitHeight: 20
+        radius: 4
 
         gradient: Gradient
         {
@@ -37,6 +37,23 @@ CheckBox
             GradientStop { position: 0.6; color: Dex.CurrentTheme.checkBoxGradientEndColor }
         }
 
+        DefaultImage {
+            id: check_icon
+            x: (parent.width - width) / 2
+            y: (parent.height - height) / 2
+            width: parent.width - 6
+            height: parent.height - 6
+            source: General.image_path + "white_check.svg"
+            visible: control.checkState === Qt.Checked
+        }
+
+        DefaultColorOverlay
+        {
+            anchors.fill: check_icon
+            source: check_icon
+            color: Dex.CurrentTheme.checkBoxTickColor
+        }
+
         DefaultRectangle
         {
             visible: !control.checked

atomic_defi_design/Dex/Exchange/Trade/BestOrder/ListDelegate.qml

@@ -122,7 +122,9 @@ Item
 
         contentItem: DexLabelUnlinked
         {
-            text_value: qsTr(" %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a>").arg(coin).arg(coin)
+            text_value: !General.isZhtlc(coin) ? 
+                qsTr(" %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a>").arg(coin).arg(coin) :
+                qsTr(" %1 is not enabled - Please enable it through the coin activation menu").arg(coin)
             wrapMode: DefaultText.Wrap
             width: 250
             onLinkActivated:

atomic_defi_design/Dex/Exchange/Trade/OrderBook/ListDelegate.qml

@@ -188,7 +188,7 @@ Item
             {
                 anchors.verticalCenter: parent.verticalCenter
                 width: parent.width * 0.37
-                text: { new BigNumber(rel_max_volume).toFixed(6) }
+                text: { new BigNumber(base_max_volume).toFixed(6) }
                 font.family: DexTypo.fontFamily
                 font.pixelSize: 12
                 horizontalAlignment: Text.AlignRight

atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubBestOrder.qml

@@ -222,7 +222,9 @@ DexListView
 
                 contentItem: DexLabelUnlinked
                 {
-                    text_value: qsTr(" %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a>").arg(coin).arg(coin)
+                    text_value: !General.isZhtlc(coin) ? 
+                        qsTr(" %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a>").arg(coin).arg(coin) :
+                        qsTr(" %1 is not enabled - Please enable it through the coin activation menu").arg(coin)
                     wrapMode: DexLabel.Wrap
                     width: 250
                     onLinkActivated:

atomic_defi_design/Dex/Portfolio/Portfolio.qml

@@ -245,8 +245,6 @@ Item {
                             id: hide_zero_balance_checkbox
 
                             spacing: 2
-                            boxWidth: 24
-                            boxHeight: 24
 
                             label.wrapMode: Label.NoWrap
                             label.font.pixelSize: 14

atomic_defi_design/Dex/Themes/CurrentTheme.qml

@@ -118,6 +118,7 @@ ThemeData
         gradientButtonTextHoveredColor      = Dex.Color.argbStrFromRgbaStr(themeData.gradientButtonTextHoveredColor || defaultTheme.gradientButtonTextHoveredColor);
         gradientButtonTextPressedColor      = Dex.Color.argbStrFromRgbaStr(themeData.gradientButtonTextPressedColor || defaultTheme.gradientButtonTextPressedColor);
 
+        checkBoxTickColor                   = Dex.Color.argbStrFromRgbaStr(themeData.checkBoxTickColor || defaultTheme.checkBoxTickColor);
         checkBoxGradientStartColor          = Dex.Color.argbStrFromRgbaStr(themeData.checkBoxGradientStartColor || defaultTheme.checkBoxGradientStartColor);
         checkBoxGradientEndColor            = Dex.Color.argbStrFromRgbaStr(themeData.checkBoxGradientEndColor || defaultTheme.checkBoxGradientEndColor);
 
@@ -240,6 +241,7 @@ ThemeData
         console.info("Dex.Themes.CurrentTheme.printValues.gradientButtonTextHoveredColor : %1".arg(gradientButtonTextHoveredColor));
         console.info("Dex.Themes.CurrentTheme.printValues.gradientButtonTextPressedColor : %1".arg(gradientButtonTextPressedColor));
 
+        console.info("Dex.Themes.CurrentTheme.printValues.checkBoxTickColor : %1".arg(checkBoxTickColor));
         console.info("Dex.Themes.CurrentTheme.printValues.checkBoxGradientStartColor : %1".arg(checkBoxGradientStartColor));
         console.info("Dex.Themes.CurrentTheme.printValues.checkBoxGradientEndColor : %1".arg(checkBoxGradientEndColor));
 

atomic_defi_design/Dex/Themes/DefaultTheme.js

@@ -34,6 +34,7 @@ function getHardcoded()
         gradientButtonTextHoveredColor: "#FFFFFFFF",
         gradientButtonTextPressedColor: "#FFFFFFFF",
 
+        checkBoxTickColor: "#000000FF",
         checkBoxGradientStartColor: "#8892EBFF",
         checkBoxGradientEndColor: "#9DD4F3FF",
 

atomic_defi_design/Dex/Themes/ThemeData.qml

@@ -33,6 +33,7 @@ QtObject
     property color  gradientButtonTextHoveredColor
     property color  gradientButtonTextPressedColor
 
+    property color  checkBoxTickColor
     property color  checkBoxGradientStartColor
     property color  checkBoxGradientEndColor
 

atomic_defi_design/Dex/Wallet/Sidebar.qml

@@ -60,7 +60,7 @@ Item
                     Layout.preferredHeight: 38
 
                     textField.placeholderText: qsTr("Search")
-                    //forceFocus: true
+                    forceFocus: true
                     searchModel: portfolio_coins
                 }
 

ci_tools_atomic_dex/ci_scripts/osx_script.sh

@@ -23,7 +23,7 @@ brew install autoconf \
 pip3 install yq
 export CC=clang
 export CXX=clang++
-export MACOSX_DEPLOYMENT_TARGET=10.14
+export MACOSX_DEPLOYMENT_TARGET=10.15
 
 # get curl
 #git clone https://github.com/KomodoPlatform/curl.git

ci_tools_atomic_dex/src/generate.nim

@@ -17,6 +17,6 @@ proc generate_solution*(build_type: string, osx_sdk_path: string, compiler_path:
                     os.getCurrentDir().parentDir().parentDir()
     when defined(osx):
         if not osx_sdk_path.isNil() and osx_sdk_path != "nil":
-            cmd_line = cmd_line & " -DCMAKE_OSX_SYSROOT=" & osx_sdk_path & " -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DPREFER_BOOST_FILESYSTEM=ON"
+            cmd_line = cmd_line & " -DCMAKE_OSX_SYSROOT=" & osx_sdk_path & " -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15"
     echo "cmd line: " & cmd_line
     discard execCmd(cmd_line)

cmake/compiler_prerequisites.cmake

@@ -7,14 +7,4 @@ endif ()
 
 if (WIN32)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-endif ()
-
-if (PREFER_BOOST_FILESYSTEM)
-    message(STATUS "Boost filesystem over std::filesystem")
-    add_compile_definitions(PREFER_BOOST_FILESYSTEM)
-endif ()
-
-#if (PREFER_BOOST_OPTIONAL)
-#    message(STATUS "Boost optional over std::optional")
-#    add_compile_definitions(PREFER_BOOST_OPTIONAL)
-#endif()
+endif ()

src/app/app.cpp

@@ -212,7 +212,7 @@ namespace atomic_dex
         {
             if (fs::exists(path_to_remove))
             {
-                fs_error_code ec;
+                std::error_code ec;
                 if (fs::is_directory(path_to_remove))
                 {
                     fs::remove_all(path_to_remove, ec);
@@ -469,7 +469,7 @@ namespace atomic_dex
 
     application::application(QObject* pParent) : QObject(pParent)
     {
-        fs::path settings_path = (atomic_dex::utils::get_current_configs_path() / "cfg.ini");
+        std::filesystem::path settings_path = (atomic_dex::utils::get_current_configs_path() / "cfg.ini");
         #if defined(_WIN32) || defined(WIN32)
             this->entity_registry_.set<QSettings>(QString::fromStdWString(settings_path.wstring()), QSettings::IniFormat);
         #else
@@ -634,7 +634,7 @@ namespace atomic_dex
         this->m_primary_coin_fully_enabled   = false;
         this->m_secondary_coin_fully_enabled = false;
         system_manager_.get_system<qt_wallet_manager>().set_status("None");
-        return fs::remove(utils::get_atomic_dex_config_folder() / "default.wallet");
+        return std::filesystem::remove(utils::get_atomic_dex_config_folder() / "default.wallet");
     }
 
     void application::connect_signals()