Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.7.1 rc #2426

Merged
merged 42 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
6a19c92
rm paprika api services
smk762 Mar 28, 2024
0d2974f
add pair trades 24hr stat
smk762 Mar 28, 2024
4ae90fe
tabbed orderbook / bestorders
smk762 Mar 28, 2024
f67e3be
fix missing cancel button for own orders on orderbook
smk762 Mar 29, 2024
e2e0b3f
Use layouts for orderbook columns
smk762 Mar 31, 2024
d960923
add outgoing/incoming text to orders modal
smk762 Apr 1, 2024
42aca12
rm logspam
smk762 Apr 1, 2024
955a091
exception avoidance
smk762 Apr 1, 2024
af650fd
add min/max vol to orders modal
smk762 Apr 1, 2024
4a2d105
Merge pull request #2415 from KomodoPlatform/update/defi-stats-api
smk762 Apr 1, 2024
a952f3d
open lcw when chart is clicked
smk762 Apr 1, 2024
22df4dd
allow testcoins through filter in simple dex view
smk762 Apr 1, 2024
8dbad10
Merge pull request #2416 from KomodoPlatform/add/bestorders-filter
smk762 Apr 2, 2024
cc7ba3e
isolate testcoins in bestorders
smk762 Apr 2, 2024
bdd6eff
Merge branch 'dev' into fix/simple-dex-testcoins
smk762 Apr 2, 2024
6110313
Merge branch 'dev' into fix/chart-hyperlink
smk762 Apr 2, 2024
ef89df2
Merge branch 'dev' into remove/paprika
smk762 Apr 2, 2024
155c661
Merge branch 'dev' into fix/orderbook-cancel
smk762 Apr 2, 2024
85e69fd
Merge branch 'dev' into add/order-info
smk762 Apr 2, 2024
3c908ae
update dex pro layout
smk762 Apr 2, 2024
8e6690c
refactor dex pro
smk762 Apr 2, 2024
8c2f797
add checkbox for good until canceled
smk762 Apr 3, 2024
c6d98df
apply order_type to rpc req body
smk762 Apr 4, 2024
c6148a7
adds maker order tab
smk762 Apr 4, 2024
5e7cf33
reset selected trade on tab switch
smk762 Apr 4, 2024
3f19105
Merge pull request #2414 from KomodoPlatform/remove/paprika
smk762 Apr 4, 2024
5cd7124
Merge pull request #2419 from KomodoPlatform/fix/orderbook-cancel
smk762 Apr 4, 2024
da0f8ff
Merge pull request #2421 from KomodoPlatform/fix/chart-hyperlink
smk762 Apr 4, 2024
e5f4fbb
disable orderbook in maker mode
smk762 Apr 4, 2024
2bd2120
Merge branch 'dev' into add/order-options
smk762 Apr 4, 2024
b52849a
Merge branch 'dev' into add/order-info
smk762 Apr 4, 2024
624b9c7
rm gitlab ci
smk762 Apr 5, 2024
d2fe944
tweak ci workflows
smk762 Apr 5, 2024
2bb35a2
Merge pull request #2422 from KomodoPlatform/fix/simple-dex-testcoins
smk762 Apr 6, 2024
fa1821f
Merge pull request #2420 from KomodoPlatform/add/order-info
smk762 Apr 6, 2024
229203a
add `is_vote_coin` category
smk762 Apr 6, 2024
c86019b
add button for vote info in wallet
smk762 Apr 6, 2024
d5c7358
set vote coins to wallet only
smk762 Apr 6, 2024
98dde1b
move warning to avoid overflow
smk762 Apr 6, 2024
7bd6127
Update ts for release
smk762 Apr 6, 2024
d8ce050
Merge pull request #2425 from KomodoPlatform/add/kip2024
smk762 Apr 8, 2024
3f25b37
Merge pull request #2424 from KomodoPlatform/add/order-options
smk762 Apr 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/atomicdex-desktop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- master
schedule:
- cron: '0 0 * * 1'
workflow_dispatch:

env:
DEX_API: "mm2_kmd"
Expand Down
26 changes: 0 additions & 26 deletions .github/workflows/sync_mirror.yml

This file was deleted.

112 changes: 0 additions & 112 deletions .gitlab-ci.yml

This file was deleted.

1 change: 0 additions & 1 deletion atomic_defi_design/Dex/Components/DexGradientAppButton.qml
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
10 changes: 10 additions & 0 deletions atomic_defi_design/Dex/Components/PairItemBadge.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions atomic_defi_design/Dex/Constants/DexTypo.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions atomic_defi_design/Dex/Constants/General.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions atomic_defi_design/Dex/Exchange/ProView/Chart.qml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ 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>
Expand Down Expand Up @@ -226,6 +227,16 @@ Item
}
}

MouseArea {
id: chart_mousearea
anchors.fill: webEngineViewPlaceHolder
onClicked: {
if (webEngineView.visible) {
Qt.openUrlExternally("https://www.livecoinwatch.com")
}
}
}

Connections
{
target: app
Expand Down
6 changes: 3 additions & 3 deletions atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ RowLayout
Layout.preferredWidth: parent.width - 15

text_value: !details ? "" :
`<font color="${root.color}"><b>${details.ticker}</b></font>&nbsp;&nbsp;&nbsp;<font color="${Dex.CurrentTheme.foregroundColor}">${details.name}</font>`
`<font color="${root.color}"><b>${details.ticker}</b></font><br /><font color="${Dex.CurrentTheme.foregroundColor2}">${details.name}</font>`
font.pixelSize: Style.textSizeSmall3
elide: Text.ElideRight
wrapMode: Text.NoWrap
Expand All @@ -96,7 +96,7 @@ RowLayout
font: DexTypo.body2
wrapMode: Label.NoWrap
ToolTip.text: coin_value
Component.onCompleted: font.pixelSize = 11.5
Component.onCompleted: font.pixelSize = 11
}

Dex.Text
Expand All @@ -112,7 +112,7 @@ RowLayout
font: DexTypo.body2
wrapMode: Label.NoWrap
ToolTip.text: fiat_value
Component.onCompleted: font.pixelSize = 11.5
Component.onCompleted: font.pixelSize = 11
}
}
}
Expand Down
Loading
Loading