From dbd2d9a0bb2bf43d40ef156b0aa58e786845bbaf Mon Sep 17 00:00:00 2001
From: Preston Van Loon <preston@prysmaticlabs.com>
Date: Fri, 31 Jul 2020 13:46:03 -0700
Subject: [PATCH] Accounts V2: improve progressbar feedback (#6814)

* Accounts V2: improve progressbar feedback
* gofmt
* Merge refs/heads/master into pb-improvements
---
 validator/accounts/v2/wallet.go          | 2 ++
 validator/keymanager/v2/direct/direct.go | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/validator/accounts/v2/wallet.go b/validator/accounts/v2/wallet.go
index cb10741d2c..867edbafa8 100644
--- a/validator/accounts/v2/wallet.go
+++ b/validator/accounts/v2/wallet.go
@@ -505,6 +505,8 @@ func (w *Wallet) enterPasswordForAllAccounts(cliCtx *cli.Context, accountNames [
 				BarStart:      "[",
 				BarEnd:        "]",
 			}),
+			progressbar.OptionOnCompletion(func() { fmt.Println() }),
+			progressbar.OptionSetDescription("Importing accounts"),
 		)
 		ctx := context.Background()
 		for i := 0; i < len(accountNames); i++ {
diff --git a/validator/keymanager/v2/direct/direct.go b/validator/keymanager/v2/direct/direct.go
index 63db9cf08b..df603f6db3 100644
--- a/validator/keymanager/v2/direct/direct.go
+++ b/validator/keymanager/v2/direct/direct.go
@@ -303,7 +303,6 @@ func (dr *Keymanager) initializeSecretKeysCache(ctx context.Context) error {
 	if len(accountNames) == 0 {
 		return nil
 	}
-	log.Info("Decrypting validator accounts...")
 	// We initialize a nice progress bar to offer the user feedback
 	// during this slow operation.
 	bar := initializeProgressBar(len(accountNames))
@@ -422,6 +421,8 @@ func initializeProgressBar(numItems int) *progressbar.ProgressBar {
 			BarStart:      "[",
 			BarEnd:        "]",
 		}),
+		progressbar.OptionOnCompletion(func() { fmt.Println() }),
+		progressbar.OptionSetDescription("Loading validator accounts"),
 	)
 }