Merge branch 'master' into firoorg-dev

KomodoPlatform · Jul 3, 2024 · 7e0837b · 7e0837b
2 parents a874e1b + 056f76f
commit 7e0837b
Show file tree

Hide file tree

Showing 86 changed files with 1,974 additions and 2,008 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.1]
+ - Komodo Wallet Desktop Version: [e.g. 0.7.2]
  - 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.1"
+  DEX_VERSION: "0.7.2"
   DEX_WEBSITE: "https://firo.org/"
 
 jobs:
@@ -374,7 +374,7 @@ jobs:
 
   windows-release:
     name: Win Build/Release
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v2
@@ -452,7 +452,7 @@ jobs:
 
   windows-debug:
     name: Win Build/Debug
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/firodex-desktop-ci.yml b/.github/workflows/firodex-desktop-ci.yml
@@ -9,6 +9,7 @@ on:
       - master
   schedule:
     - cron: '0 0 * * 1'
+  workflow_dispatch:
 
 env:
   DEX_API: "mm2_firo"
@@ -17,7 +18,7 @@ env:
   DEX_PROJECT_NAME: "firodex"
   DEX_DISPLAY_NAME: "Firo Dex"
   DEX_COMPANY: "Firo"
-  DEX_VERSION: "0.7.1"
+  DEX_VERSION: "0.7.2"
   DEX_WEBSITE: "https://firo.org/"
   VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
   VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
@@ -68,13 +69,13 @@ jobs:
             host: 'mac'
 
           - name: windows-release
-            os: windows-latest
+            os: windows-2019
             qt: '5.15.2'
             type: 'Release'
             host: 'windows'
 
           - name: windows-debug
-            os: windows-latest
+            os: windows-2019
             qt: '5.15.2'
             type: 'Debug'
             host: 'windows'

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
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.1)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.7.2)
 message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
 
 include(cmake_default_options)
@@ -60,13 +60,13 @@ endif ()
 ##! We fetch our dependencies
 if (APPLE)
     FetchContent_Declare(mm2
-            URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-mac-x86-64.zip)
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Darwin-Release.zip)
 elseif (UNIX AND NOT APPLE)
     FetchContent_Declare(mm2
-            URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-linux-x86-64.zip)
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Linux-Release.zip)
 else ()
     FetchContent_Declare(mm2
-            URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-win-x86-64.zip)
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Win64.zip)
 endif ()
 
 #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)

diff --git a/assets/config/cfg.json b/assets/config/cfg.json
@@ -1,6 +1,7 @@
 {
   "notification_enabled": true,
   "spamfilter_enabled": false,
+  "postorder_enabled": false,  
   "use_static_rpcpass": false,
   "current_currency": "USD",
   "current_fiat": "USD",

diff --git a/atomic_defi_design/Dex/Addressbook/Main.qml b/atomic_defi_design/Dex/Addressbook/Main.qml
@@ -120,6 +120,13 @@ Item
             }
         }
 
+        Dex.Text {
+            visible: contactTable.count == 0
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            text: qsTr("No contacts found.")
+        }
+
         // Contact table content
         Dex.DefaultListView
         {

diff --git a/atomic_defi_design/Dex/Components/DexGradientAppButton.qml b/atomic_defi_design/Dex/Components/DexGradientAppButton.qml
@@ -22,7 +22,6 @@ DexRectangle
 
     property bool text_left_align: false
 
-    property int minWidth: 90
 
     property real textScale: 1
 

diff --git a/atomic_defi_design/Dex/Components/PairItemBadge.qml b/atomic_defi_design/Dex/Components/PairItemBadge.qml
@@ -24,11 +24,21 @@ DexRectangle
     property int padding: 0
     property alias middle_text: middle_line.text_value
     property alias bottom_text: bottom_line.text_value
+    property bool is_left: false
     Layout.fillHeight: true
     Layout.fillWidth: true
     Layout.leftMargin: 10
     Layout.rightMargin: 20
 
+    Dex.Text{
+        anchors.bottom: parent.top
+        anchors.bottomMargin: 5
+        anchors.horizontalCenter: parent.horizontalCenter
+        text: is_left ? "Outgoing" : "Incoming"
+        font: Dex.DexTypo.italic12
+        color: Dex.CurrentTheme.foregroundColor2
+    }
+
     RowLayout
     {
         anchors.fill: parent

diff --git a/atomic_defi_design/Dex/Constants/DexTypo.qml b/atomic_defi_design/Dex/Constants/DexTypo.qml
@@ -154,6 +154,13 @@ QtObject {
         family: "Courier",
         weight: Font.Normal
     })
+    property font italic12: Qt.font({
+        pixelSize: 12 * fontDensity,
+        letterSpacing: 0.2,
+        family: fontFamily,
+        weight: Font.Normal,
+        italic: true
+    })
     property font inputFieldFont: Qt.font({
         pixelSize: (16 * DexTypo.fontDensity) * (Screen.pixelDensity / 160),
         letterSpacing: 0.5,

diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml
@@ -88,6 +88,11 @@ QtObject {
         return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_faucet_coin
     }
 
+    function isVoteCoin(ticker)
+    {
+        return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_vote_coin
+    }
+
     function isCoinWithMemo(ticker)
     {
         return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).has_memos
@@ -566,7 +571,7 @@ QtObject {
         }
         return diffPrefix(received) +
                 (fiat === API.app.settings_pg.current_fiat ? API.app.settings_pg.current_fiat_sign : API.app.settings_pg.current_currency_sign)
-                + " " + (amount < 1E5 ? formatDouble(parseFloat(amount), precision, true) : nFormatter(parseFloat(amount), 2))
+                + " " + (amount < 1E5 ? formatDouble(parseFloat(amount), precision, true) : nFormatter(parseFloat(amount), precision))
     }
 
     function formatPercent(value, show_prefix=true) {

diff --git a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml
@@ -37,12 +37,14 @@ Item
             {
                 pair_supported = false
                 selected_testcoin = left_ticker
+                console.log("no chart, testcoin", selected_testcoin)
                 return
             }
             if (General.is_testcoin(right_ticker))
             {
                 pair_supported = false
                 selected_testcoin = right_ticker
+                console.log("no chart, testcoin", selected_testcoin)
                 return
             }
 
@@ -52,9 +54,13 @@ Item
             {
                 pair_supported = true
                 symbol = rel_ticker+"-"+base_ticker
+                console.log("symbol", symbol)
+                console.log("loaded_symbol", loaded_symbol)
+
                 if (symbol === loaded_symbol && !force)
                 {
                     webEngineViewPlaceHolder.visible = true
+                    console.log("symbol === loaded_symbol, ok")
                     return
                 }
                 chart_html = `
@@ -64,13 +70,14 @@ Item
                         transform: scale(${Math.min(scale_x, scale_y)});
                         transform-origin: top left;
                     }
+                    a { pointer-events: none; }
                 </style>
                 <script defer src="https://www.livecoinwatch.com/static/lcw-widget.js"></script>
                 <div class="livecoinwatch-widget-1" lcw-coin="${rel_ticker}" lcw-base="${base_ticker}" lcw-secondary="USDC" lcw-period="w" lcw-color-tx="${Dex.CurrentTheme.foregroundColor}" lcw-color-pr="#58c7c5" lcw-color-bg="${Dex.CurrentTheme.comboBoxBackgroundColor}" lcw-border-w="0" lcw-digits="8" ></div>
                 `
             }
         }
-        // console.log(chart_html)
+        console.log(chart_html)
 
         if (chart_html == "")
         {
@@ -84,6 +91,7 @@ Item
             if (!symbol)
             {
                 pair_supported = false
+                console.log("pair not supported", pair, pair_reversed)
                 return
             }
 
@@ -165,7 +173,7 @@ Item
         DefaultText
         {
             visible: pair_supported
-            text_value: qsTr("Loading market data") + "..."
+            text_value: qsTr("Loading pair chart data") + "..."
         }
 
         DefaultText
@@ -190,7 +198,7 @@ Item
         id: webEngineViewPlaceHolder
         anchors.fill: parent
         anchors.centerIn: parent
-        visible: false
+        visible: true
 
         Component.onCompleted:
         {
@@ -219,6 +227,16 @@ Item
         }
     }
 
+    MouseArea {
+        id: chart_mousearea
+        anchors.fill: webEngineViewPlaceHolder
+        onClicked: {
+            if (webEngineView.visible) {
+                Qt.openUrlExternally("https://www.livecoinwatch.com")
+            }
+        }
+    }
+
     Connections
     {
         target: app
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,7 +22,6 @@ DexRectangle

		property bool text_left_align: false

		property int minWidth: 90

		property real textScale: 1

Expand Down