Merge pull request #371 from github/shana/fix-prlist-refresh

Fix the pr list refresh and reload

Author: shana

src/GitHub.App/Controllers/UIController.cs

@@ -736,16 +736,21 @@ bool CreateViewAndViewModel(UIViewType viewType, ViewWithData data = null)
                 }
             }
 
-            if (!list.ContainsKey(viewType))
+            IUIPair pair = null;
+            var firstTime = !list.TryGetValue(viewType, out pair);
+
+            if (firstTime)
+                pair = factory.CreateViewAndViewModel(viewType);
+
+            pair.ViewModel.Initialize(data);
+
+            if (firstTime)
             {
-                var d = factory.CreateViewAndViewModel(viewType);
-                d.ViewModel.Initialize(data);
-                d.View.DataContext = d.ViewModel;
-                list.Add(viewType, d);
-                return true;
+                pair.View.DataContext = pair.ViewModel;
+                list.Add(viewType, pair);
             }
 
-            return false;
+            return firstTime;
         }
 
 
@@ -834,6 +839,7 @@ public void Dispose()
 
         public bool IsStopped => uiStateMachine.IsInState(UIViewType.None) || stopping;
         public UIControllerFlow CurrentFlow => activeFlow;
+        public UIControllerFlow SelectedFlow => mainFlow;
         bool LoggedIn => connection != null && hosts.LookupHost(connection.HostAddress).IsLoggedIn;
         bool? Success { get; set; }
     }

src/GitHub.Exports/UI/IUIController.cs

@@ -17,6 +17,7 @@ public interface IUIController
         void Stop();
         bool IsStopped { get; }
         UIControllerFlow CurrentFlow { get; }
+        UIControllerFlow SelectedFlow { get; }
         void Jump(ViewWithData where);
     }
 

src/GitHub.VisualStudio/UI/Views/GitHubPaneViewModel.cs

@@ -133,7 +133,7 @@ async Task Reload([AllowNull] ViewWithData data = null, bool navigating = false)
 
             if (IsLoggedIn)
             {
-                if (uiController == null || (data != null && data.ActiveFlow != uiController.CurrentFlow))
+                if (uiController == null || (data != null && data.ActiveFlow != uiController.SelectedFlow))
                     StartFlow(data?.ActiveFlow ?? UIControllerFlow.PullRequests, connection, data);
                 else if (data != null || currentNavItem >= 0)
                     uiController.Jump(data ?? navStack[currentNavItem]);