From 06c56b599ad984763f4418c298a15d97eb39bebb Mon Sep 17 00:00:00 2001 From: Vuong <3168632+vuon9@users.noreply.github.com> Date: Sun, 30 Jan 2022 12:12:42 +0700 Subject: [PATCH] Fix issues of sort by view --- cointop/cointop.go | 4 ++-- cointop/sort.go | 2 +- cointop/table.go | 2 +- cointop/table_header.go | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cointop/cointop.go b/cointop/cointop.go index 42add5d..e5789d2 100644 --- a/cointop/cointop.go +++ b/cointop/cointop.go @@ -289,11 +289,11 @@ func NewCointop(config *Config) (*Cointop, error) { selectedChartRange: DefaultChartRange, shortcutKeys: DefaultShortcuts(), selectedView: CoinsView, + page: 0, + perPage: int(perPage), viewSorts: map[string]*sortConstraint{ CoinsView: {DefaultSortBy, false}, }, - page: 0, - perPage: int(perPage), portfolio: &Portfolio{ Entries: make(map[string]*PortfolioEntry), }, diff --git a/cointop/sort.go b/cointop/sort.go index e6d8a54..7fd9c36 100644 --- a/cointop/sort.go +++ b/cointop/sort.go @@ -89,7 +89,7 @@ func (ct *Cointop) Sort(sortCons *sortConstraint, list []*Coin, renderHeaders bo // SortAsc sorts list of coins in ascending order func (ct *Cointop) SortAsc() error { log.Debug("SortAsc()") - ct.State.viewSorts[ct.State.selectedView].sortDesc = true + ct.State.viewSorts[ct.State.selectedView].sortDesc = false ct.UpdateTable() return nil } diff --git a/cointop/table.go b/cointop/table.go index 0622cef..225178a 100644 --- a/cointop/table.go +++ b/cointop/table.go @@ -269,7 +269,7 @@ func (ct *Cointop) SetSelectedView(viewName string) { ct.State.lastSelectedView = ct.State.selectedView ct.State.selectedView = viewName - // init sort constraint for the view in case user travels it in the first time + // init sort constraint for the view if it hasn't been seen before if _, found := ct.State.viewSorts[viewName]; !found { ct.State.viewSorts[viewName] = &sortConstraint{DefaultSortBy, false} } diff --git a/cointop/table_header.go b/cointop/table_header.go index 7a84977..da49b21 100644 --- a/cointop/table_header.go +++ b/cointop/table_header.go @@ -217,11 +217,11 @@ func (ct *Cointop) UpdateTableHeader() error { arrow := " " colorfn := baseColor if !noSort { - corSortCons := ct.State.viewSorts[ct.State.selectedView] - if corSortCons.sortBy == col { + currentSortCons := ct.State.viewSorts[ct.State.selectedView] + if currentSortCons.sortBy == col { colorfn = ct.colorscheme.TableHeaderColumnActiveSprintf() arrow = ArrowUp - if corSortCons.sortDesc { + if currentSortCons.sortDesc { arrow = ArrowDown } }