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.

Sign up for GitHub

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

multi: update dex client #633

Merged
merged 9 commits into from
Sep 25, 2024
Merged

multi: update dex client #633

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb092ce
libwallet/asset: update btc and dcr dexwallet with upstream changes
ukane-philemon Sep 6, 2024
d143ee9
libwallet/asset: update dex wallet implementation
ukane-philemon Sep 6, 2024
7581c6d
ui/page/dcrdex: handle actions for wallet and account dropdown
ukane-philemon Sep 6, 2024
1341418
multi: handle dex copy action in HandleUserInteractions annd typo fix
ukane-philemon Sep 6, 2024
756a6cf
fix dropdown and scroll issue
JustinBeBoy Sep 7, 2024
2db84a9
multi: update dex implementation
ukane-philemon Sep 10, 2024
7b3143e
handle dex mnemonic seed display
ukane-philemon Sep 10, 2024
abbac44
cache exchange info
ukane-philemon Sep 24, 2024
8619024
use cache for bond fee
ukane-philemon Sep 25, 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 ui/cryptomaterial/dropdown.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ func (d *DropDown) collapsedAndExpandedLayout(gtx C) D {
// expandedLayout computes dropdown layout when dropdown is opened.
func (d *DropDown) expandedLayout(gtx C) D {
m := op.Record(gtx.Ops)
gtx.Constraints.Max.Y = inf
d.layout(gtx, d.ExpandedLayoutInset, d.listItemLayout)
op.Defer(gtx.Ops, m.Stop())
return D{}
Expand Down
31 changes: 12 additions & 19 deletions ui/page/dcrdex/market.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func NewDEXMarketPage(l *load.Load, selectServer string) *DEXMarketPage {
openOrdersAndOrderHistoryContainer: &widget.List{List: layout.List{Axis: vertical, Alignment: layout.Middle}},
addServerBtn: th.NewClickable(false),
toggleBuyAndSellBtn: th.SegmentedControl(buyAndSellBtnStrings, cryptomaterial.SegmentTypeGroup),
orderTypesDropdown: th.NewCommonDropDown(orderTypes, nil, values.MarginPadding120, values.DEXOrderTypes, true),
orderTypesDropdown: th.NewCommonDropDown(orderTypes, nil, values.MarginPadding100, values.DEXOrderTypes, false),
priceEditor: newTextEditor(l.Theme, values.String(values.StrPrice), "", false),
switchLotsOrAmount: l.Theme.Switch(),
lotsOrAmountEditor: newTextEditor(l.Theme, values.String(values.StrLots), "", false),
Expand Down Expand Up @@ -540,10 +540,11 @@ func (pg *DEXMarketPage) Layout(gtx C) D {
return D{}
}

pageContent := []func(gtx C) D{
pg.priceAndVolumeDetail,
pg.orderFormAndOrderBook,
pg.openOrdersAndHistory,
pageContent := []layout.FlexChild{
layout.Rigid(pg.serverAndCurrencySelection),
layout.Rigid(pg.priceAndVolumeDetail),
layout.Rigid(pg.orderFormAndOrderBook),
layout.Rigid(pg.openOrdersAndHistory),
}

return cryptomaterial.LinearLayout{
Expand All @@ -557,17 +558,7 @@ func (pg *DEXMarketPage) Layout(gtx C) D {
Direction: layout.Center,
}.Layout2(gtx, func(gtx C) D {
return pg.Theme.List(pg.scrollContainer).Layout(gtx, 1, func(gtx C, _ int) D {
return layout.Stack{}.Layout(gtx,
layout.Expanded(func(gtx C) D {
return layout.Inset{Top: 110}.Layout(gtx, func(gtx C) D {
l := &layout.List{Axis: vertical}
return l.Layout(gtx, len(pageContent), func(gtx C, i int) D {
return pageContent[i](gtx)
})
})
}),
layout.Stacked(pg.serverAndCurrencySelection),
)
return layout.Flex{Axis: layout.Vertical}.Layout(gtx, pageContent...)
})
})
}
Expand All @@ -576,6 +567,7 @@ func (pg *DEXMarketPage) serverAndCurrencySelection(gtx C) D {
return cryptomaterial.LinearLayout{
Width: cryptomaterial.MatchParent,
Height: gtx.Dp(100),
Margin: layout.Inset{Top: dp5, Bottom: dp5},
Background: pg.Theme.Color.Surface,
Padding: layout.UniformInset(dp16),
Border: cryptomaterial.Border{
Expand Down Expand Up @@ -929,8 +921,9 @@ func (pg *DEXMarketPage) orderForm(gtx C) D {
return pg.toggleBuyAndSellBtn.GroupTileLayout(gtx)
}),
layout.Flexed(1, func(gtx C) D {
pg.orderTypesDropdown.Background = &pg.Theme.Color.Surface
return layout.Inset{Bottom: dp5, Top: dp5}.Layout(gtx, pg.orderTypesDropdown.Layout)
return layout.E.Layout(gtx, func(gtx C) D {
return layout.Inset{Bottom: dp5, Top: dp5}.Layout(gtx, pg.orderTypesDropdown.Layout)
})
}),
)
}),
Expand Down Expand Up @@ -1236,7 +1229,7 @@ func (pg *DEXMarketPage) openOrdersAndHistory(gtx C) D {
Width: cryptomaterial.MatchParent,
Height: sectionHeight,
Background: pg.Theme.Color.Surface,
Margin: layout.Inset{Top: dp5, Bottom: 30},
Margin: layout.Inset{Top: dp5, Bottom: dp5},
Padding: layout.UniformInset(dp10),
Border: cryptomaterial.Border{
Radius: cryptomaterial.Radius(8),
Expand Down
Loading