potentially fix credentials issue

pkg/gui/credentials_panel.go

@@ -48,7 +48,7 @@ func (gui *Gui) handleSubmitCredential() error {
 		return err
 	}
 
-	return gui.refreshSidePanels(refreshOptions{})
+	return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
 }
 
 func (gui *Gui) handleCloseCredentialsView() error {
@@ -78,6 +78,7 @@ func (gui *Gui) handleCredentialsPopup(cmdErr error) {
 		if strings.Contains(errMessage, "Invalid username, password or passphrase") {
 			errMessage = gui.Tr.PassUnameWrong
 		}
+		_ = gui.returnFromContext()
 		// we are not logging this error because it may contain a password or a passphrase
 		_ = gui.createErrorPanel(errMessage)
 	} else {

pkg/gui/files_panel.go

@@ -729,6 +729,10 @@ func (gui *Gui) pushFiles() error {
 
 	// if we have pullables we'll ask if the user wants to force push
 	currentBranch := gui.currentBranch()
+	if currentBranch == nil {
+		// need to wait for branches to refresh
+		return nil
+	}
 
 	if currentBranch.Pullables == "?" {
 		// see if we have this branch in our config with an upstream

pkg/gui/layout.go

@@ -355,10 +355,10 @@ func (gui *Gui) onInitialViewsCreation() error {
 		// popups. Ordering within this layer does not matter because there should
 		// only be one popup shown at a time
 		gui.Views.CommitMessage,
-		gui.Views.Credentials,
 		gui.Views.Menu,
 		gui.Views.Suggestions,
 		gui.Views.Confirmation,
+		gui.Views.Credentials,
 
 		// this guy will cover everything else when it appears
 		gui.Views.Limit,