Merge branch 'master' into fixes/2149-search-box-crash

Author: jcansdale

src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs

@@ -137,8 +137,8 @@ public async Task InitializeAsync(IConnection connection)
 
             this.WhenAnyValue(x => x.SelectedTabIndex).Subscribe(x => tabs[x].Activate().Forget());
 
-            // When a clipboard URL has been set or a user is in group A, show the URL tab by default
-            if (!string.IsNullOrEmpty(UrlTab.Url) || await IsGroupA().ConfigureAwait(false))
+            // When a clipboard URL has been set, show the URL tab by default
+            if (!string.IsNullOrEmpty(UrlTab.Url))
             {
                 SelectedTabIndex = 2;
             }
@@ -157,14 +157,6 @@ public async Task InitializeAsync(IConnection connection)
             }
         }
 
-        // Put 50% of users in group A
-        async Task<bool> IsGroupA()
-        {
-            var userGuid = await usageService.GetUserGuid().ConfigureAwait(false);
-            var lastByte = userGuid.ToByteArray().Last();
-            return lastByte % 2 == 0;
-        }
-
         void BrowseForDirectory()
         {
             var result = os.Dialog.BrowseForDirectory(Path, Resources.BrowseForDirectory);

src/GitHub.VisualStudio.UI/Views/GitHubPane/GitHubPaneView.xaml

@@ -43,6 +43,7 @@
     <uic:InfoPanel x:Name="infoPanel"
                    DockPanel.Dock="Top"
                    Message="{Binding Message}"
+                   ShowCloseButton="True"
                    VerticalAlignment="Top"/>
     <StackPanel DockPanel.Dock="Top"
                 Margin="6,9,9,5"

src/GitHub.VisualStudio.UI/Views/GitHubPane/GitHubPaneView.xaml.cs

@@ -27,7 +27,6 @@ public GitHubPaneView(INotificationDispatcher notifications)
 
             this.WhenActivated(d =>
             {
-                infoPanel.Visibility = Visibility.Collapsed;
                 d(notifications.Listen()
                     .ObserveOnDispatcher(DispatcherPriority.Normal)
                     .Subscribe(n =>

test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositoryCloneViewModelTests.cs

@@ -37,8 +37,8 @@ public async Task GitHubPage_Is_Initialized()
 
         [TestCase("https://github.com", null, false, 0)]
         [TestCase("https://enterprise.com", null, false, 1)]
-        [TestCase("https://github.com", null, true, 2, Description = "Show URL tab for GitHub connections")]
-        [TestCase("https://enterprise.com", null, true, 2, Description = "Show URL tab for Enterprise connections")]
+        [TestCase("https://github.com", null, true, 0, Description = "Show URL tab for GitHub connections")]
+        [TestCase("https://enterprise.com", null, true, 1, Description = "Show URL tab for Enterprise connections")]
         [TestCase("https://github.com", "https://github.com/github/visualstudio", false, 2)]
         [TestCase("https://enterprise.com", "https://enterprise.com/owner/repo", false, 2)]
         public async Task Default_SelectedTabIndex_For_Group(string address, string clipboardUrl, bool isGroupA, int expectTabIndex)
@@ -56,8 +56,8 @@ public async Task Default_SelectedTabIndex_For_Group(string address, string clip
 
         [TestCase("https://github.com", false, 1, nameof(UsageModel.MeasuresModel.NumberOfCloneViewGitHubTab))]
         [TestCase("https://enterprise.com", false, 1, nameof(UsageModel.MeasuresModel.NumberOfCloneViewEnterpriseTab))]
-        [TestCase("https://github.com", true, 1, nameof(UsageModel.MeasuresModel.NumberOfCloneViewUrlTab))]
-        [TestCase("https://enterprise.com", true, 1, nameof(UsageModel.MeasuresModel.NumberOfCloneViewUrlTab))]
+        [TestCase("https://github.com", true, 1, nameof(UsageModel.MeasuresModel.NumberOfCloneViewGitHubTab))]
+        [TestCase("https://enterprise.com", true, 1, nameof(UsageModel.MeasuresModel.NumberOfCloneViewEnterpriseTab))]
         public async Task IncrementCounter_Showing_Default_Tab(string address, bool isGroupA, int numberOfCalls, string counterName)
         {
             var cm = CreateConnectionManager(address);