From 3c9b482708a0a25fffdfd9b94936b71b455409e3 Mon Sep 17 00:00:00 2001
From: Miguel Mota <miguelmota2@gmail.com>
Date: Sun, 31 Jan 2021 22:30:20 -0800
Subject: [PATCH] Go to portfolio page after exiting entry update menu

---
 Makefile                |  2 ++
 cointop/portfolio.go    | 12 ++++++++----
 cointop/price_alerts.go |  2 ++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index b24778e..15d6f53 100644
--- a/Makefile
+++ b/Makefile
@@ -218,6 +218,8 @@ docker-run:
 docker-push:
 	docker push cointop/cointop:latest
 
+docker-build-and-push: docker-build docker-push
+
 docker-run-ssh:
 	docker run -p 2222:22 -v ~/.ssh/demo:/keys --entrypoint cointop -it cointop/cointop server -k /keys/id_rsa
 
diff --git a/cointop/portfolio.go b/cointop/portfolio.go
index 059a4b2..a925b8e 100644
--- a/cointop/portfolio.go
+++ b/cointop/portfolio.go
@@ -332,6 +332,9 @@ func (ct *Cointop) SetPortfolioHoldings() error {
 	ct.debuglog("setPortfolioHoldings()")
 	defer ct.HidePortfolioUpdateMenu()
 	coin := ct.HighlightedRowCoin()
+	if coin == nil {
+		return nil
+	}
 
 	// read input field
 	b := make([]byte, 100)
@@ -370,6 +373,7 @@ func (ct *Cointop) SetPortfolioHoldings() error {
 		return err
 	}
 
+	ct.ToggleShowPortfolio()
 	return nil
 }
 
@@ -559,14 +563,14 @@ func (ct *Cointop) PrintHoldingsTable(options *TablePrintOptions) error {
 
 	if sortBy != "" {
 		if _, ok := portfolioColumns[sortBy]; !ok {
-			return fmt.Errorf("The option %q is not a valid column name", sortBy)
+			return fmt.Errorf("the option %q is not a valid column name", sortBy)
 		}
 
 		ct.Sort(sortBy, sortDesc, holdings, true)
 	}
 
 	if _, ok := outputFormats[format]; !ok {
-		return fmt.Errorf("The option %q is not a valid format type", format)
+		return fmt.Errorf("the option %q is not a valid format type", format)
 	}
 
 	total := ct.GetPortfolioTotal()
@@ -574,7 +578,7 @@ func (ct *Cointop) PrintHoldingsTable(options *TablePrintOptions) error {
 	symbol := ct.CurrencySymbol()
 
 	for i, entry := range holdings {
-		if filter != nil && len(filter) > 0 {
+		if len(filter) > 0 {
 			found := false
 			for _, item := range filter {
 				item = strings.ToLower(strings.TrimSpace(item))
@@ -687,7 +691,7 @@ func (ct *Cointop) PrintTotalHoldings(options *TablePrintOptions) error {
 	portfolio := ct.GetPortfolioSlice()
 	var total float64
 	for _, entry := range portfolio {
-		if filter != nil && len(filter) > 0 {
+		if len(filter) > 0 {
 			found := false
 			for _, item := range filter {
 				item = strings.ToLower(strings.TrimSpace(item))
diff --git a/cointop/price_alerts.go b/cointop/price_alerts.go
index 54f6525..9a21170 100644
--- a/cointop/price_alerts.go
+++ b/cointop/price_alerts.go
@@ -256,6 +256,7 @@ func (ct *Cointop) UpdatePriceAlertsUpdateMenu(isNew bool) error {
 // ShowPriceAlertsAddMenu shows the alert add menu
 func (ct *Cointop) ShowPriceAlertsAddMenu() error {
 	ct.debuglog("showPriceAlertsAddMenu()")
+	ct.ToggleSelectedView(PriceAlertsView)
 	ct.State.lastSelectedRowIndex = ct.HighlightedPageRowIndex()
 	ct.UpdatePriceAlertsUpdateMenu(true)
 	ct.ui.SetCursor(true)
@@ -267,6 +268,7 @@ func (ct *Cointop) ShowPriceAlertsAddMenu() error {
 
 // ShowPriceAlertsUpdateMenu shows the alerts update menu
 func (ct *Cointop) ShowPriceAlertsUpdateMenu() error {
+	ct.ToggleSelectedView(PriceAlertsView)
 	ct.debuglog("showPriceAlertsUpdateMenu()")
 	ct.State.lastSelectedRowIndex = ct.HighlightedPageRowIndex()
 	ct.UpdatePriceAlertsUpdateMenu(false)