Merge pull request #225 from lyricnz/feature/show-currency-marketbar

Move currencyConversion out of chartInfo - so it shows when hideChart=true

cointop/marketbar.go

@@ -78,10 +78,9 @@ func (ct *Cointop) UpdateMarketbar() error {
 		chartInfo := ""
 		if !ct.State.hideChart {
 			chartInfo = fmt.Sprintf(
-				"[ Chart: %s %s %s ] ",
+				"[ Chart: %s %s ] ",
 				charttitle,
 				timeframe,
-				ct.State.currencyConversion,
 			)
 		}
 
@@ -92,8 +91,9 @@ func (ct *Cointop) UpdateMarketbar() error {
 		}
 
 		content = fmt.Sprintf(
-			"%sTotal Portfolio Value: %s • 24H: %s",
+			"%sTotal Portfolio Value %s: %s • 24H: %s",
 			chartInfo,
+			ct.State.currencyConversion,
 			ct.colorscheme.MarketBarLabelActive(totalstr),
 			percentChange24Hstr,
 		)
@@ -142,10 +142,9 @@ func (ct *Cointop) UpdateMarketbar() error {
 		chartInfo := ""
 		if !ct.State.hideChart {
 			chartInfo = fmt.Sprintf(
-				"[ Chart: %s %s %s] ",
+				"[ Chart: %s %s] ",
 				ct.colorscheme.MarketBarLabelActive(chartname),
 				timeframe,
-				ct.State.currencyConversion,
 			)
 		}
 
@@ -166,8 +165,9 @@ func (ct *Cointop) UpdateMarketbar() error {
 		}
 
 		content = fmt.Sprintf(
-			"%sGlobal ▶ Market Cap: %s %s 24H Volume: %s %s BTC Dominance: %.2f%%",
+			"%sGlobal %s ▶ Market Cap: %s %s 24H Volume: %s %s BTC Dominance: %.2f%%",
 			chartInfo,
+			ct.State.currencyConversion,
 			fmt.Sprintf("%s%s", ct.CurrencySymbol(), marketCapStr),
 			separator1,
 			fmt.Sprintf("%s%s", ct.CurrencySymbol(), volumeStr),