Resetting the UI when going back or finishing

Author: shana

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationView.cs

@@ -26,10 +26,10 @@ class AuthenticationView : Subview
         [SerializeField] private string username = string.Empty;
         [SerializeField] private string two2fa = string.Empty;
         [SerializeField] private string message;
+        [SerializeField] private string errorMessage;
+        [SerializeField] private bool need2fa;
 
-        [NonSerialized] private bool need2fa;
         [NonSerialized] private bool isBusy;
-        [NonSerialized] private string errorMessage;
         [NonSerialized] private bool enterPressed;
         [NonSerialized] private string password = string.Empty;
         [NonSerialized] private AuthenticationService authenticationService;
@@ -39,6 +39,7 @@ public override void InitializeView(IView parent)
         {
             base.InitializeView(parent);
             need2fa = isBusy = false;
+            message = errorMessage = null;
             Title = WindowTitle;
             Size = viewSize;
         }
@@ -167,8 +168,7 @@ private void OnGUI2FA()
                         if (GUILayout.Button(BackButton))
                         {
                             GUI.FocusControl(null);
-                            need2fa = false;
-                            Redraw();
+                            Clear();
                         }
 
                         if (GUILayout.Button(TwofaButton) || (!isBusy && enterPressed))
@@ -189,27 +189,36 @@ private void OnGUI2FA()
 
         private void DoRequire2fa(string msg)
         {
-            Logger.Trace("Strating 2FA - Message:\"{0}\"", msg);
+            Logger.Trace("Starting 2FA - Message:\"{0}\"", msg);
 
             need2fa = true;
             errorMessage = msg;
             isBusy = false;
             Redraw();
         }
 
+        private void Clear()
+        {
+            need2fa = false;
+            errorMessage = null;
+            isBusy = false;
+            Redraw();
+        }
+
         private void DoResult(bool success, string msg)
         {
             Logger.Trace("DoResult - Success:{0} Message:\"{1}\"", success, msg);
 
-            errorMessage = msg;
             isBusy = false;
 
             if (success == true)
             {
+                Clear();
                 Finish(true);
             }
             else
             {
+                errorMessage = msg;
                 Redraw();
             }
         }