Skip to content

Commit 7e0837b

Browse files
smk762smk762
committed
Merge branch 'master' into firoorg-dev
2 parents a874e1b + 056f76f commit 7e0837b

File tree

86 files changed

+1974
-2008
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1974
-2008
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Please describe what you expected to happen.
2626
**Operating Environment(s):**
2727
- OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ]
2828
- OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ]
29-
- Komodo Wallet Version: [e.g. 0.7.1]
29+
- Komodo Wallet Desktop Version: [e.g. 0.7.2]
3030
- Build branch: [e.g. master/dev]
3131

3232

‎.github/workflows/firodex-desktop-cd.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
DEX_PROJECT_NAME: "firodex-desktop"
1010
DEX_DISPLAY_NAME: "FiroDex Desktop"
1111
DEX_COMPANY: "Firo Core Team"
12-
DEX_VERSION: "0.7.1"
12+
DEX_VERSION: "0.7.2"
1313
DEX_WEBSITE: "https://firo.org/"
1414

1515
jobs:
@@ -374,7 +374,7 @@ jobs:
374374

375375
windows-release:
376376
name: Win Build/Release
377-
runs-on: windows-latest
377+
runs-on: windows-2019
378378

379379
steps:
380380
- uses: actions/checkout@v2
@@ -452,7 +452,7 @@ jobs:
452452

453453
windows-debug:
454454
name: Win Build/Debug
455-
runs-on: windows-latest
455+
runs-on: windows-2019
456456

457457
steps:
458458
- uses: actions/checkout@v2

‎.github/workflows/firodex-desktop-ci.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
- master
1010
schedule:
1111
- cron: '0 0 * * 1'
12+
workflow_dispatch:
1213

1314
env:
1415
DEX_API: "mm2_firo"
@@ -17,7 +18,7 @@ env:
1718
DEX_PROJECT_NAME: "firodex"
1819
DEX_DISPLAY_NAME: "Firo Dex"
1920
DEX_COMPANY: "Firo"
20-
DEX_VERSION: "0.7.1"
21+
DEX_VERSION: "0.7.2"
2122
DEX_WEBSITE: "https://firo.org/"
2223
VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
2324
VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
@@ -68,13 +69,13 @@ jobs:
6869
host: 'mac'
6970

7071
- name: windows-release
71-
os: windows-latest
72+
os: windows-2019
7273
qt: '5.15.2'
7374
type: 'Release'
7475
host: 'windows'
7576

7677
- name: windows-debug
77-
os: windows-latest
78+
os: windows-2019
7879
qt: '5.15.2'
7980
type: 'Debug'
8081
host: 'windows'

‎.gitlab-ci.yml

-112
This file was deleted.

‎CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
1111
include(qt_prerequisites)
1212
include(cfg_hash)
1313

14-
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.7.1)
14+
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.7.2)
1515
message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
1616

1717
include(cmake_default_options)
@@ -60,13 +60,13 @@ endif ()
6060
##! We fetch our dependencies
6161
if (APPLE)
6262
FetchContent_Declare(mm2
63-
URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-mac-x86-64.zip)
63+
URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Darwin-Release.zip)
6464
elseif (UNIX AND NOT APPLE)
6565
FetchContent_Declare(mm2
66-
URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-linux-x86-64.zip)
66+
URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Linux-Release.zip)
6767
else ()
6868
FetchContent_Declare(mm2
69-
URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-win-x86-64.zip)
69+
URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Win64.zip)
7070
endif ()
7171

7272
#FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)

‎assets/config/cfg.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"notification_enabled": true,
33
"spamfilter_enabled": false,
4+
"postorder_enabled": false,
45
"use_static_rpcpass": false,
56
"current_currency": "USD",
67
"current_fiat": "USD",

‎atomic_defi_design/Dex/Addressbook/Main.qml

+7
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,13 @@ Item
120120
}
121121
}
122122

123+
Dex.Text {
124+
visible: contactTable.count == 0
125+
Layout.fillWidth: true
126+
Layout.fillHeight: true
127+
text: qsTr("No contacts found.")
128+
}
129+
123130
// Contact table content
124131
Dex.DefaultListView
125132
{

‎atomic_defi_design/Dex/Components/DexGradientAppButton.qml

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ DexRectangle
2222

2323
property bool text_left_align: false
2424

25-
property int minWidth: 90
2625

2726
property real textScale: 1
2827

‎atomic_defi_design/Dex/Components/PairItemBadge.qml

+10
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,21 @@ DexRectangle
2424
property int padding: 0
2525
property alias middle_text: middle_line.text_value
2626
property alias bottom_text: bottom_line.text_value
27+
property bool is_left: false
2728
Layout.fillHeight: true
2829
Layout.fillWidth: true
2930
Layout.leftMargin: 10
3031
Layout.rightMargin: 20
3132

33+
Dex.Text{
34+
anchors.bottom: parent.top
35+
anchors.bottomMargin: 5
36+
anchors.horizontalCenter: parent.horizontalCenter
37+
text: is_left ? "Outgoing" : "Incoming"
38+
font: Dex.DexTypo.italic12
39+
color: Dex.CurrentTheme.foregroundColor2
40+
}
41+
3242
RowLayout
3343
{
3444
anchors.fill: parent

‎atomic_defi_design/Dex/Constants/DexTypo.qml

+7
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ QtObject {
154154
family: "Courier",
155155
weight: Font.Normal
156156
})
157+
property font italic12: Qt.font({
158+
pixelSize: 12 * fontDensity,
159+
letterSpacing: 0.2,
160+
family: fontFamily,
161+
weight: Font.Normal,
162+
italic: true
163+
})
157164
property font inputFieldFont: Qt.font({
158165
pixelSize: (16 * DexTypo.fontDensity) * (Screen.pixelDensity / 160),
159166
letterSpacing: 0.5,

‎atomic_defi_design/Dex/Constants/General.qml

+6-1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ QtObject {
8888
return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_faucet_coin
8989
}
9090

91+
function isVoteCoin(ticker)
92+
{
93+
return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_vote_coin
94+
}
95+
9196
function isCoinWithMemo(ticker)
9297
{
9398
return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).has_memos
@@ -566,7 +571,7 @@ QtObject {
566571
}
567572
return diffPrefix(received) +
568573
(fiat === API.app.settings_pg.current_fiat ? API.app.settings_pg.current_fiat_sign : API.app.settings_pg.current_currency_sign)
569-
+ " " + (amount < 1E5 ? formatDouble(parseFloat(amount), precision, true) : nFormatter(parseFloat(amount), 2))
574+
+ " " + (amount < 1E5 ? formatDouble(parseFloat(amount), precision, true) : nFormatter(parseFloat(amount), precision))
570575
}
571576

572577
function formatPercent(value, show_prefix=true) {

‎atomic_defi_design/Dex/Exchange/ProView/Chart.qml

+21-3
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,14 @@ Item
3737
{
3838
pair_supported = false
3939
selected_testcoin = left_ticker
40+
console.log("no chart, testcoin", selected_testcoin)
4041
return
4142
}
4243
if (General.is_testcoin(right_ticker))
4344
{
4445
pair_supported = false
4546
selected_testcoin = right_ticker
47+
console.log("no chart, testcoin", selected_testcoin)
4648
return
4749
}
4850

@@ -52,9 +54,13 @@ Item
5254
{
5355
pair_supported = true
5456
symbol = rel_ticker+"-"+base_ticker
57+
console.log("symbol", symbol)
58+
console.log("loaded_symbol", loaded_symbol)
59+
5560
if (symbol === loaded_symbol && !force)
5661
{
5762
webEngineViewPlaceHolder.visible = true
63+
console.log("symbol === loaded_symbol, ok")
5864
return
5965
}
6066
chart_html = `
@@ -64,13 +70,14 @@ Item
6470
transform: scale(${Math.min(scale_x, scale_y)});
6571
transform-origin: top left;
6672
}
73+
a { pointer-events: none; }
6774
</style>
6875
<script defer src="https://www.livecoinwatch.com/static/lcw-widget.js"></script>
6976
<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>
7077
`
7178
}
7279
}
73-
// console.log(chart_html)
80+
console.log(chart_html)
7481

7582
if (chart_html == "")
7683
{
@@ -84,6 +91,7 @@ Item
8491
if (!symbol)
8592
{
8693
pair_supported = false
94+
console.log("pair not supported", pair, pair_reversed)
8795
return
8896
}
8997

@@ -165,7 +173,7 @@ Item
165173
DefaultText
166174
{
167175
visible: pair_supported
168-
text_value: qsTr("Loading market data") + "..."
176+
text_value: qsTr("Loading pair chart data") + "..."
169177
}
170178

171179
DefaultText
@@ -190,7 +198,7 @@ Item
190198
id: webEngineViewPlaceHolder
191199
anchors.fill: parent
192200
anchors.centerIn: parent
193-
visible: false
201+
visible: true
194202

195203
Component.onCompleted:
196204
{
@@ -219,6 +227,16 @@ Item
219227
}
220228
}
221229

230+
MouseArea {
231+
id: chart_mousearea
232+
anchors.fill: webEngineViewPlaceHolder
233+
onClicked: {
234+
if (webEngineView.visible) {
235+
Qt.openUrlExternally("https://www.livecoinwatch.com")
236+
}
237+
}
238+
}
239+
222240
Connections
223241
{
224242
target: app

0 commit comments

Comments
 (0)